slides class 5
fixed merge conflict