Cleared merged conflict