added solutions
merge