Should make merge conflict
Resolved merge conflict