Added a comment for where Dog will be added
Merging and fixing conflicts