typo fix
lab7 beta up
merge resolved