Fixing a bad merge