Fixed additional merge issue

previous merge resoluion inserted junk code.  Cleaned it up in this
commit.  Program will run.