File changes in branch1
conflict happens