update solution
merge solution
merge harder