merge for Lesson 4