Fix a few more merge conflicts

@derekjones merge conflicts are still happening, but they're made easier to fix