resolve a merge conflict.