Remove Git merge conflicts