diff --git a/tdesktop.patch b/tdesktop.patch
index 4655dcf..259e562 100644
--- a/tdesktop.patch
+++ b/tdesktop.patch
@@ -7,11 +7,7 @@ Index: tdesktop-1.2.6/Telegram/Resources/qrc/telegram_linux.qrc
    <qresource prefix="/qt">
 -    <file alias="etc/qt.conf">../etc/qt_linux.conf</file>
    </qresource>
-<<<<<<< ./tdesktop.patch.mine
- </RCC>
-=======
    <qresource prefix="/fc">
->>>>>>> ./tdesktop.patch.rc44a18716743178f1d760ce699dba268
 Index: tdesktop-1.2.6/Telegram/SourceFiles/qt_functions.cpp
 ===================================================================
 --- /dev/null