resolved coflicts