fixed minor junk code caused by git merge