diff --git a/bot/awesomescibo.js b/bot/awesomescibo.js
index 4477086..3c699fc 100755
--- a/bot/awesomescibo.js
+++ b/bot/awesomescibo.js
@@ -488,10 +488,7 @@ async function userRounds(message) {
   });
 
   const roundsEmbed = new Discord.MessageEmbed()
-<<<<<<< HEAD
-=======
     .setAuthor(message.author.tag, message.author.displayAvatarURL())
->>>>>>> e70c83d (Change embed title and add author)
     .setTitle(`Last 5 rounds requested by ${message.author.tag}`)
     .setDescription(finalMessage)
     .setTimestamp();