remove conflict marker