Remove hanging conflict marker