Getting rid of conflicts.