Removing merge-conflict indicator.