corrected size of tutorial window
resolved conflict