revert conflict manager