updating problem 9
Fixing merge conflicts