remove conflict marks that were committed mistakenly