fix confilct