diff --git a/changelog.md b/changelog.md
--- a/changelog.md
+++ b/changelog.md
@@ -6,6 +6,10 @@
 
 ## master
 
+## 1.8.8
+
+Remove git artifacts from [examples/ping-pong.hs](https://github.com/aquarial/discord-haskell/issues/69)
+
 ## 1.8.7
 
 Add [Stage channel](https://github.com/aquarial/discord-haskell/issues/68) and a catch-all Unknown channel so we stop crashing on new releases (?)
diff --git a/discord-haskell.cabal b/discord-haskell.cabal
--- a/discord-haskell.cabal
+++ b/discord-haskell.cabal
@@ -1,7 +1,7 @@
 cabal-version:       2.0
 name:                discord-haskell
 -- library version is also noted at src/Discord/Rest/Prelude.hs
-version:             1.8.7
+version:             1.8.8
 description:         Functions and data types to write discord bots.
                      Official discord docs <https://discord.com/developers/docs/reference>.
                      .
diff --git a/examples/ping-pong.hs b/examples/ping-pong.hs
--- a/examples/ping-pong.hs
+++ b/examples/ping-pong.hs
@@ -67,7 +67,6 @@
 
         -- A more complex message. Text-to-speech, does not mention everyone nor
         -- the user, and uses Discord native replies.
-<<<<<<< HEAD
         -- Use ":info" in ghci to explore the type
         let opts :: R.MessageDetailedOpts
             opts = def { R.messageDetailedContent = "Here's a more complex message, but doesn't ping @everyone!"
@@ -77,15 +76,6 @@
                               , R.mentionRepliedUser = False
                               }
                        , R.messageDetailedReference = Just $
-=======
-        let opts = def { messageDetailedContent = "Here's a more complex message, but doesn't ping @everyone!"
-                       , messageDetailedTTS = True
-                       , messageDetailedAllowedMentions = Just $
-                          def { mentionEveryone = False
-                              , mentionRepliedUser = False
-                              }
-                       , messageDetailedReference = Just $
->>>>>>> 219a850... minor formatting to ping example
                           def { referenceMessageId = Just $ messageId m }
                        }
         _ <- restCall (R.CreateMessageDetailed (messageChannel m) opts)
diff --git a/src/Discord/Internal/Rest/Prelude.hs b/src/Discord/Internal/Rest/Prelude.hs
--- a/src/Discord/Internal/Rest/Prelude.hs
+++ b/src/Discord/Internal/Rest/Prelude.hs
@@ -29,7 +29,7 @@
   where
   -- | https://discord.com/developers/docs/reference#user-agent
   -- Second place where the library version is noted
-  agent = "DiscordBot (https://github.com/aquarial/discord-haskell, 1.8.7)"
+  agent = "DiscordBot (https://github.com/aquarial/discord-haskell, 1.8.8)"
 
 -- Append to an URL
 infixl 5 //