diff --git a/source/launcher/CMakeLists.txt b/source/launcher/CMakeLists.txt
index 112539c..42768f8 100644
--- a/source/launcher/CMakeLists.txt
+++ b/source/launcher/CMakeLists.txt
@@ -47,6 +47,10 @@ endif()
 
 add_dependencies(launcher KytyGitVersion)  
 
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
 set(launcher_name "launcher")
 
 set_target_properties(launcher PROPERTIES OUTPUT_NAME ${launcher_name})