Getting rid of conflicts