diff --git a/names.md b/names.md
index d4b8d24..1d5f319 100644
--- a/names.md
+++ b/names.md
@@ -17,7 +17,12 @@ Mattee-ah Turick
 Maxibillion Blazin’
 Migelle Divvoh
 Niña Roorke
-Peter Pogo-stick
+<<<<<<< HEAD
+Peter Pogo-stickit into somewhere
 Piper Donk
+=======
+Peter Pogo-stick
+Piper Deck
+>>>>>>> piperdeck-name-fix
 Sofia Feldrin
 Time “waits for no one” Udvarhelyi