commit in newbranch
commit in master
mergeconflict