diff --git a/PolyChat/MainPage.xaml.cs b/PolyChat/MainPage.xaml.cs
index 245e679..b91a0bb 100644
--- a/PolyChat/MainPage.xaml.cs
+++ b/PolyChat/MainPage.xaml.cs
@@ -156,13 +156,8 @@ namespace PolyChat
                         new ChatMessage(
                             origin,
                             item["type"].ToString(),
-<<<<<<< Updated upstream
-                            item["content"].ToString()//,
-                                                      //DateTime.Parse(item["timestamp"].ToString())
-=======
                             item["content"].ToString(),
                             DateTime.Parse(item["timestamp"].ToString())
->>>>>>> Stashed changes
                         )
                     );
                 }