fix merge conflicts for documentation rework