revert confilct