Merge solve

yay