@Bobby_Thomas, looks like you have a Git merge conflict. This appears when you change the same lines of code locally (from PsychoPy) and remotely (from Pavlovia). At this point, your easiest solution is clear your local repository (deleting .git folder), delete your remote repo (so long as you are not data collecting) and start again: Here are explicit steps:
Edit: To avoid merge conflicts, you should only amend code on using PsychoPy, rather than making changes through Pavlovia.