more bad merging