/rebase_and_merge_2

rebase and merge 2

rebase_and_merge_2

rebase and merge 2 modify in master modify in feature-1 modify in feature-2