update step4 solution
merge