Revert incorrect conflict resolution edit.