Trying to create a merge conflict
Trying to create a merge conflict again
Resolved merge conflict