Changed class Dog
Fixed merge conflict