Solving problem
Warmup1 solution
merge conflict