Added the class in testmodel to reproduce git conflict situation
Merge branch 'create_class_for_git_conflict_test'