some merging got away