Added my solution; fixed problematic merge