Cleared merge conflicts