Working on order flow
merging