Hi I need some help

Hey I am working on a game with a friend and I need some help not necessarily with the game itself but with the merge changes that popped up. I had just finished a decent portion and went to push the changes and now it is have lots of errors.