getting rid of conflicts