started merging phase 2 and 1 workflow