after correct revert
Revert "Revert "Merge branch 'branchC' into branchB""

This reverts commit f82f407011c2ac552e033f87261d137e87d9b523.
Merge branch 'branchC' into branchB