GitHub repository: ttpu/lab7-b-codebefore94
Description: se_spm_2024_2025-lab7_b-resolve-merge-conflicts created by GitHub Classroom