fixed remaining merge issues