Resolve merge conflicts: integrate folder support with master dependency updates

Successfully merged origin/master into feature/confluence-folder-support branch.
This merge preserves all folder support functionality while incorporating
dependency updates from master (mermaid.go v0.0.32 → v0.0.33).

Key folder features preserved:
- Folder metadata headers support
- v2 REST API client for folder endpoints
- ParentInfo struct for mixed folder/page hierarchy
- EnsureFolderAncestry and EnsureMixedAncestry functions
- CreatePageWithFolderParent API method
- Comprehensive folder test coverage

Changes integrated:
- Dependency update: github.com/dreampuf/mermaid.go v0.0.33
- All folder functionality remains intact and tested

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: klauern

page/ancestry.go

@@ -210,7 +210,6 @@ func EnsureMixedAncestry(
 
 	return pageParent, nil
 }
-
 func EnsureAncestry(
 	dryRun bool,
 	api *confluence.API,

page/page.go

@@ -192,6 +192,5 @@ func ResolvePage(
 			meta.Title,
 		)
 	}
-
 	return parent, page, nil
 }