v1.0.6

Full Changelog: v1.0.5...v1.0.6

fix: ensure upstream changes are included in PR commits

• Add conflicted files to staging area before committing
• Ensures upstream changes are properly included in PR
• Fixes issue where only local changes were committed