fix conflict analysis