changes in branch1
change 2  in branch1
change 3  in branch1
change   in branch2
change 3  in branch2
change 4  in branch2
conflicts resolved, merge branch2