Remove trailing conflict marker which slipped in