Forgot to take off a conflict marker