Update the code for flow merging