Fix mismerge of mode_standalone.cpp
Merge pull request #1547 from runrevstephen/mismerge-cmdlinestack

Fix mismerge of mode_standalone.cpp