test7 corrected
manipulate conflict
Merge branch 'master' of https://github.com/bcip/nachos