? It's looks like you were doing some merging. You shouldn't have had to do this. As the instructions for the assignment state, everything through part 1 was already completed for you (except for the last two items, user annotations and the 'my links' page). I had to do a lot of cleanup and fixing just to get the app to the point where I could see it in my browser.