merge the conflict part