Conflict1
Conflict2
Merge branch 'TestConflict'