Finish CH5 exercise
merge