student solution added
merge