adding a dog and yellow buttons
fixed merge