lab4 The Code is in The master class for some reason when I try to do a pull request it doesn't work in order to merge the two branch into one

people in the group unwar, Kareena, Paez, Luis and samrawit weldehawariyat