updated solution
merge