revert another conflict