During a project retrospective, a junior team member raises a minor concern about the naming convention used in a shared code repository. A senior developer, who set the original convention, becomes visibly frustrated. The issue has negligible impact on project outcomes, but the project manager notices that preserving goodwill between the two is important for upcoming collaborative work. Which conflict-resolution approach should the project manager encourage the junior member to consider in this situation?