create dog
fixed merge conflicts