Minor changes
Resolved conflicts
Apparently, I had botched some of the merges when I used the mergetool, so I fixed those botched merges.