deleted one file
Merge branch 'master' into test-branch
Retrieved the file back
added the annoying file
Merge branch 'master' into test-branch
deleted a comment on some stuff
Merge branch 'master' into test-branch
comment inserted back
Inserted a different comment on this branch
First conflict resolved
And now made different changes
Merge branch 'master' into test-branch