adds merge conflict note
resolved merge conflict