merge the conflict