all coflicts was removed