Added some more to the dialog.  It is running at over 4 minutes now.  Consolodated the text into some strings
Fixed merge conflicts
Fixed merge conflicts