router merge fix