Well...somehow...the merge happened. I think I'm going to have to go finish up on reading the book I bought about Git before I'll be able to understand how to correctly merge everything.