Trying to create a merge-conflict
resolved merge-conflict