branch test
AND simple
& simple
conflict fixed
4-add 'but not changes''
Merge branch 'feature1'
abc
def
conflict 2 fixed