hw02
merge