fix merge error
Merge branch 'lab05' of https://github.com/jjhlzn/6.828 into lab05