fixed remaining conflicts