/appAcademy_merging_conflicts

first-branch