diff --git a/Qss.cpp b/Qss.cpp
index 1e18d2e..bf91185 100644
--- a/Qss.cpp
+++ b/Qss.cpp
@@ -286,13 +286,10 @@ QssMainWindow::QssMainWindow(QWidget *parent/* = 0*/, Qt::WindowFlags flags/* =
     qDebug()<<css;
     m_frame->setStyleSheet(css);
 
-<<<<<<< Updated upstream
     mShadowMask = new  QWidget(this);
     mShadowMask->setStyleSheet("QWidget{background-color:rgba(1,1,1,0.3);}");
     mShadowMask->hide();
 
-=======
->>>>>>> Stashed changes
     return;
 }