solution one
updated the diff, and function arguments of merge
dfdfdf