Get rid of conflicts