test comment added
master comment added
preparing auto-merge
manually merged
amend successful
testing weeewear
manually merged
another testing
simulating conflict
Merge branch 'testing'
line breaks added
some lines added
resolved conflict