task 48 and 57
fixed merge conflict