diff --git a/CMakeLists.txt b/CMakeLists.txt
index d58bd057..aa509397 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@ if(MSVC)
     set(CMAKE_CXX_EXTENSIONS OFF)
 endif()
 
-find_package(Qt5 5.11 COMPONENTS Core Gui Widgets Network Quick REQUIRED)
+find_package(Qt5 5.11 COMPONENTS Core Gui Widgets Network Qml Quick REQUIRED)
 find_package(Threads REQUIRED)
 
 set(CMAKE_AUTOMOC ON)
diff --git a/CMakeLists.txt.orig b/CMakeLists.txt.orig
index d58bd057..4961cd1f 100644
--- a/CMakeLists.txt.orig
+++ b/CMakeLists.txt.orig
@@ -33,8 +33,12 @@ if(MSVC)
     set(CMAKE_CXX_EXTENSIONS OFF)
 endif()
 
+<<<<<<< HEAD
 find_package(Qt5 5.11 COMPONENTS Core Gui Widgets Network Quick REQUIRED)
 find_package(Threads REQUIRED)
+=======
+find_package(Qt5 5.11 COMPONENTS Core Gui Widgets Network Qml Quick REQUIRED)
+>>>>>>> 90a54f7... oops
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)