remove conflict marks