Section 5.1.3 partials
fix merge conflict