problem1
merge
hw1