revert conflicts