[No review required] Remove hanging conflict marker