finished the course
fixed merge conflict