Revert conflicts