Solve problem 7
Merge problem 7 solutions