Fix conflicts from revert