Removes catch comment"
Merge branch 'master' of https://arempe93@github.com/arempe93/conflict_test.git