diff --git a/madlibs/stories.txt b/madlibs/stories.txt
index 01b97c6..6fa0990 100644
--- a/madlibs/stories.txt
+++ b/madlibs/stories.txt
@@ -7,6 +7,11 @@ Thank you for choosing AMC Cinemas. Where we make movie moments AMC <adjective e
 <NFL on What Channel?!>
 The NFL is back! On our new home! Welcome to the most in-depth pregame show in all of pregame shows. This is the NFL on <tv network> brought to you by <food brand>! Hang tight and we'll be right back! Scene 2: Welcome in to Sunday on <same tv network>! My name is <celebrity>, and I am sitting alongside four celebrities, <celebrity>, <celebrity>, <celebrity>, and <celebrity>. Welcome guys. Week <number> is looking promising as we have three key games to focus on. First off, the <nfl team> take on the <nfl team>, our afternoon game, the <nfl team> vs the <nfl team>. Finally, our primetime game, the <nfl team> vs the <nfl team>. A lot of action today, and we will break that down soon in the <amount of time> coming. Before we do anything, let's take a live look inside <stadium> where the first key match will be playred, and we have our field reporter, <celebrity> who is covering our action. Scene 3: Alright, thank you. Now, it's time for kickoff of our first key game. We hope you enjoy the game and we will <verb> you at halftime.
 <Awards Show>
+<<<<<<< HEAD
 Welcome everyone to <famous city> and the <year> MadLib awards show. Here are the nominees for <random award show category>. First, <former president>. Next, <actor/actress>. And finally, <random silly name>. And the winner is... <one of the names you put>! <winner> could not be here tonight so he recorded a message for us to see. Take a look. Winner: Hello all. Thank you, the fans, for voting. I really appreciate it. I am sorry I couldn't be there. 
 <caleb wanted me to do a thing now it will commence>
 Once upon a time in the land of <city>, there was a lovely little chap called <name>, but everyone just <verb ending in ed> to call him <silly word>. You see, he was the hero of the nearby city of <another city>, and that made the mayor of the city he lived in, <celebrity>, very unhappy. So, in an act of <noun>, he created his own <noun> army to take over the world.  Now <same silly word> did not like this, so he <verb ending in ed> up to the main robot, which the mayor was in, and told him "<phrase>". The mayor, hearing those words, instantly surrendered and <verb>. He was then charged for 3 major acts of <noun>.
+=======
+Welcome everyone to <famous city> and the <year> MadLib awards show. Here are the nominees for <random award show category>. First, <former president>. Next, <actor/actress>. And finally, <random silly name>. And the winner is... <one of the names you put>! <winner> could not be here tonight so the winner recorded a message for us to see. Take a look. Winner: Hello all. Thank you, the fans, for voting. I really appreciate it. I am sorry I couldn't be there. I want to thank <random name>, for being there every step. Also, i'd like to thank my wife, <random girls name>, for <verb ending in ing>. Thank you all. Good <time of day>. 
+
+>>>>>>> 695ea65cb7dd2948b93f151627019e5be55fa160