I wish I could believe that this is the end of the merge conflicts, but I'm sure more will rear their head. heads? whatever.