rebase_and_merge_4

modify in master