Add conflicting line
Add some other stuff
Merge test-merge-conflict into master