Another student solution
merge