added a line to dog
conflict resolved