remove stray conflict marker