Warmup1 solution
merge conflict