Fix the flow merge functionality