cleared merge conflicts