merge

2 solutions is better than 1