Fixing coflicts