added_master-only
Merge branch 'mybranch1'
master
fixed conflict
Merge branch 'mybranch1'
newline
newline1
newline2_onmybranch1