merge conflict
send message
resolved merge conflicts