Worked on the HeroFan71/Xquery_Pr-ctica repository to stabilize project documentation following a merge conflict. Focused on resolving discrepancies in Conflicto.md, ensuring the final content accurately reflected the intended updates after the merge. Applied conflict resolution skills and careful documentation practices to clarify the Markdown file, reducing potential confusion for future contributors. No new features were introduced during this period; the primary contribution was a targeted bug fix that improved documentation reliability. This work supported smoother onboarding and collaboration by maintaining clear, up-to-date project information. The technical approach emphasized Markdown editing and systematic conflict management to enhance overall documentation quality.