finish exercise 40
finish exercise 41
merge conflict resolved