added exceptions problem
fixed merge conflict in solutions