merge
Merging, and removing merge conflicts that were pushed into the repo. Don't do that.