Fix revert conflicts