diff --git a/memos.py b/memos.py
index 5caed14..1aab273 100644
--- a/memos.py
+++ b/memos.py
@@ -395,21 +395,12 @@ class PesterMemo(PesterConvo):
         self.optionsMenu.addAction(self.logchum)
         self.optionsMenu.addAction(self.invitechum)
 
-<<<<<<< HEAD
-        self.chanModeMenu = QtGui.QMenu("Memo Settings", self)
-        self.chanNoquirks = QtGui.QAction("Disable Quirks", self)
-        self.chanNoquirks.setCheckable(True)
-        self.connect(self.chanNoquirks, QtCore.SIGNAL('toggled(bool)'),
-                     self, QtCore.SLOT('noquirksChan(bool)'))
-        self.chanHide = QtGui.QAction("Hidden", self)
-=======
         self.chanModeMenu = QtGui.QMenu(self.mainwindow.theme["main/menus/rclickchumlist/memosetting"], self)
         self.chanNoquirks = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/memonoquirk"], self)
         self.chanNoquirks.setCheckable(True)
         self.connect(self.chanNoquirks, QtCore.SIGNAL('toggled(bool)'),
                      self, QtCore.SLOT('noquirksChan(bool)'))
         self.chanHide = QtGui.QAction(self.mainwindow.theme["main/menus/rclickchumlist/memohidden"], self)
->>>>>>> upstream/master
         self.chanHide.setCheckable(True)
         self.connect(self.chanHide, QtCore.SIGNAL('toggled(bool)'),
                      self, QtCore.SLOT('hideChan(bool)'))
@@ -845,9 +836,6 @@ class PesterMemo(PesterConvo):
                 if msg == self.mainwindow.profile().handle:
                     self.quirksOff.setChecked(True)
                     self.applyquirks = False
-<<<<<<< HEAD
-                    # TODO: Politely notify the client
-=======
                     systemColor = QtGui.QColor(self.mainwindow.theme["memos/systemMsgColor"])
                     chum = self.mainwindow.profile()
                     opchum = PesterProfile(op)
@@ -860,7 +848,6 @@ class PesterMemo(PesterConvo):
                     msg = chum.memoquirkkillmsg(opchum, opgrammar, systemColor)
                     self.textArea.append(convertTags(msg))
                     self.mainwindow.chatlog.log(self.channel, msg)
->>>>>>> upstream/master
 
     def chumOPstuff(self, h, op):
         chum = PesterProfile(h)
@@ -1237,3 +1224,4 @@ class PesterMemo(PesterConvo):
 timelist = ["0:00", "0:01", "0:02", "0:04", "0:06", "0:10", "0:14", "0:22", "0:30", "0:41", "1:00", "1:34", "2:16", "3:14", "4:13", "4:20", "5:25", "6:12", "7:30", "8:44", "10:25", "11:34", "14:13", "16:12", "17:44", "22:22", "25:10", "33:33", "42:00", "43:14", "50:00", "62:12", "75:00", "88:44", "100", "133", "143", "188", "200", "222", "250", "314", "333", "413", "420", "500", "600", "612", "888", "1000", "1025"]
 
 timedlist = [timedelta(0), timedelta(0, 60), timedelta(0, 120), timedelta(0, 240), timedelta(0, 360), timedelta(0, 600), timedelta(0, 840), timedelta(0, 1320), timedelta(0, 1800), timedelta(0, 2460), timedelta(0, 3600), timedelta(0, 5640), timedelta(0, 8160), timedelta(0, 11640), timedelta(0, 15180), timedelta(0, 15600), timedelta(0, 19500), timedelta(0, 22320), timedelta(0, 27000), timedelta(0, 31440), timedelta(0, 37500), timedelta(0, 41640), timedelta(0, 51180), timedelta(0, 58320), timedelta(0, 63840), timedelta(0, 80520), timedelta(1, 4200), timedelta(1, 34380), timedelta(1, 64800), timedelta(1, 69240), timedelta(2, 7200), timedelta(2, 51120), timedelta(3, 10800), timedelta(3, 60240), timedelta(4, 14400), timedelta(5, 46800), timedelta(5, 82800), timedelta(7, 72000), timedelta(8, 28800), timedelta(9, 21600), timedelta(10, 36000), timedelta(13, 7200), timedelta(13, 75600), timedelta(17, 18000), timedelta(17, 43200), timedelta(20, 72000), timedelta(25), timedelta(25, 43200), timedelta(37), timedelta(41, 57600), timedelta(42, 61200)]
+