add solutions
add solutions
change to solution
change merge