stash-merge-fix
Rewriting phase2.cpp

-Erasing different strategies
-Simplifying a little bit