test_flow comitting test flow
test_flow update the merge function