When resolving conflicts, also remove the conflict markers.