fixed coflicts