revert conflict