I'm also a student applicant and not a core developer, so take whatever I write with a pinch of salt.

You seem to have ran into some kind of merge conflict. Please resolve it.
Also I noticed that you have made the changes in you master branch. It is a good idea to keep your master branch clean and make changes for a PR in a new different branch.