Removing incorrect "No Changes" after merge conflicts