Merge with the master phase 2 complete