Fix a couple of bad merges