fix for bad merges