GitHub repository: ttpu/lab-7b-codebefore94
Description: se_spm_2024_2025-lab_7b-resolve-merge-conflicts created by GitHub Classroom