Fix bad (manual) merge
Fix another bit of bad merging