diff --git a/dog.c b/dog.c
index 7b4bffa..605df9f 100644
--- a/dog.c
+++ b/dog.c
@@ -1,3 +1,21 @@
+<<<<<<< HEAD
 rocky
 tommy
 bruno
+=======
+puppy
+canine
+wolf
+bark
+bow wow
+pikachu
+charmander
+squirtle
+bulbasaur
+charmelon
+charizard
+ivysaur
+venasaur
+wartortle
+blastoise
+>>>>>>> origin/merge-exercise