swapped out correct homework2
merge