This message indicates that you have a merge conflict. You'll want to pick either the code between ```<<<<<<< HEAD
``` and ```+=======``` or the code between ```+=======``` and ```>>>>>>> c38138b5fb9f41b4216928ca4a57ca74277a3767``` and delete the other. Then recommit the code and push to github. Merge conflicts can be annoying, but it is a great skill to learn how to navigate and resolve them. We can go over it more tomorrow morning.