fix some bad merges