Changed back to dog stories
fixed the merge conflict