diff --git a/resources/res.qrc b/resources/res.qrc
index 0603d19c..71e8b997 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -157,16 +157,13 @@
         <file>qml/device-verification/NewVerificationRequest.qml</file>
         <file>qml/device-verification/Failed.qml</file>
         <file>qml/device-verification/Success.qml</file>
-<<<<<<< HEAD
         <file>qml/ui/Ripple.qml</file>
-=======
         <file>qml/voip/ActiveCallBar.qml</file>
         <file>qml/voip/CallDevices.qml</file>
         <file>qml/voip/CallInviteBar.qml</file>
         <file>qml/voip/DeviceError.qml</file>
         <file>qml/voip/PlaceCall.qml</file>
         <file>qml/voip/VideoCall.qml</file>
->>>>>>> b8b642219db37b1bf46ae47c01a446a7a4e24317
     </qresource>
     <qresource prefix="/media">
         <file>media/ring.ogg</file>