get rid of conflicts