diff --git a/events.xml b/events.xml
index 197fd89..e4adc79 100644
--- a/events.xml
+++ b/events.xml
@@ -17,6 +17,10 @@
 </abstract>
 
 </eventitem>
+<<<<<<< HEAD
+=======
+
+>>>>>>> f176137835745620bb6a3bc79175de9c375bbc30
 <eventitem date="2011-02-17" time="07:00 PM" room="MC2017" title="A Smorgasbord of Perl Talks">
   
     <short><p><i>by KW Perl Mongers</i>. These talks are intended for programmers who are curious about the Swiss Army Chainsaw of languages, Perl.</p></short>