added sample file to easy lessons, fixed merging issues