old_contents: from .spath import shortest_path
  from .mcp import MCP, MCP_Geometric, MCP_Connect, MCP_Flexible, route_through_array
  from .graph_cut import cut_threshold, cut_normalized
  <<<<<<< HEAD
  from .rag import rag_mean_color, RAG, draw_rag
  =======
  from .graph_merge import merge_hierarchical
  >>>>>>> working code
  ncut = cut_normalized
  
  
  __all__ = ['shortest_path',
             'MCP',
             'MCP_Geometric',
             'MCP_Connect',
             'MCP_Flexible',
             'route_through_array',
             'rag_mean_color',
             'cut_threshold',
             'cut_normalized',
             'ncut',
             'draw_rag',
             'merge_hierarchical',
             'RAG']
  
new_contents: from .spath import shortest_path
  from .mcp import MCP, MCP_Geometric, MCP_Connect, MCP_Flexible, route_through_array
  from .graph_cut import cut_threshold, cut_normalized
  from .rag import rag_mean_color, RAG, draw_rag
  from .graph_merge import merge_hierarchical
  ncut = cut_normalized
  
  
  __all__ = ['shortest_path',
             'MCP',
             'MCP_Geometric',
             'MCP_Connect',
             'MCP_Flexible',
             'route_through_array',
             'rag_mean_color',
             'cut_threshold',
             'cut_normalized',
             'ncut',
             'draw_rag',
             'merge_hierarchical',
             'RAG']
  
subject: Rebase work