Ryan, please merge this into develop

Wow... I am trying to have a good attitude about git, but this is a big mess.

I just wanted to make a new branch, but when I pulled from upstream develop to get the latest version, I got a headache instead.
 
I thought I had pushed all my old changes in develop long ago and that Ryan merged them already, but apparently git thinks there were more that weren't merged, and then there was a conflict that wanted to be resolved, but then it thought it resolved itself after all.  

How did we get a conflict that needed resolving in the first place?  
1. Maybe I somehow didn't stage everything for pushing last time because git thinks I might like to do a lot of work and then ignore it all and not stage it so that later I can have conflicts!?  So this time maybe all the changes actually got staged but they were too late and missed Ryan's last merge of my pull request?
2. Maybe Ryan didn't merge all my changes last time? 
3. Maybe after the last pull request I forgot to branch before editing and made a change after Ryan's last merge.
4. Maybe I didn't correctly remember all the steps of what I am supposed to do. I thought I wrote the whole workflow down last time I talked to Ryan, but sometimes it seems like I get a different set of steps to follow every time I ask someone about how I am supposed to use git. 

I would like to know how that conflict got resolved.  It was asking for my help to resolve it, but then it didn't show me the conflict or the resolution.

At any rate, I don't know for sure what happened, but whatever it was, Ryan, please clean this up and merge anything that needs merging into develop so that when I pull from upstream next time I can have a clean version to branch from.