Fixed coflicts