commit in branch1
commit in master
fixed conflict