modified lesson 03
merge