Conflict 1 from auto-merge
Hello, world!
Merge 2
Merge 3
Merge 4
Merge 5
COnflict 1 from test-auto-merge