Boris: Don't use conflict markers.