after manipulating .git
Merge remote-tracking branch 'ClassroomSalonTab/master'
please please please please please please please please please please please please please please please please please please please please please please please please please please please please please please please please