merge solutions for 1 and 2