Revert: Fix up conflicts