Remember, the assignment requires you pass the Travis CI Test

[shots47s]

I am seeing two things that are preventing this from working:

1. Your pull request has conflicts within, you will need to resolve the conflicts (the button there should be live). Clicking the resolve conflcts button will bring up the files that are in conflict, and then you can edit them to make sure that the code is properly merged and working. Then after you resolve all of the conflicts, you will be able to commit the merge and TravisCI should start shortly after.

2. There are still a number of you with PEP8 non compliant code and that is causing TravisCI to fail. Recall, you can run pycodestyle separately to ensure you will pass this test prior to committing. Please make sure that you are fully PEP8 complaint.