remove conflict markers
add comment
another file, on a branch
more content
some supportive comments
parallel change on master
Merge branch 'newbranch' - yes we do
resolve conflicts