playing with branches
playing with branches2
adding a conflict
Merge branch 'other'
blah
blah2
Fixed conflict
More stuff
Take that world!
Conflict resolved by deletion
Blah lots
I changed nothing!
Blah