setup for merge test
create conflict
merged file
Undid all merge stuff