confilct fix