git is asking for a sync before pushing master branch

branches out of sync
Took out apps that arent from week 1

erased app created from video demo
Have a conflict

getting rid of conflict