diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt
index 04b2b786be..96a42cc462 100644
--- a/interface/CMakeLists.txt
+++ b/interface/CMakeLists.txt
@@ -21,6 +21,7 @@ set(VISAGE_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/visage")
 set(LEAPMOTION_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/leapmotion")
 set(RTMIDI_ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/rtmidi")
 
+
 find_package(Qt5LinguistTools REQUIRED)
 find_package(Qt5LinguistToolsMacros)
 
@@ -150,7 +151,6 @@ find_package(PrioVR)
 find_package(SDL)
 find_package(Sixense)
 find_package(Visage)
-find_package(LeapMotion)
 find_package(ZLIB)
 find_package(Qxmpp)
 
@@ -210,6 +210,7 @@ if (PRIOVR_FOUND AND NOT DISABLE_PRIOVR)
   target_link_libraries(${TARGET_NAME} "${PRIOVR_LIBRARIES}")
 endif (PRIOVR_FOUND AND NOT DISABLE_PRIOVR)
 
+<<<<<<< HEAD
 # and with LeapMotion library
 if (LEAPMOTION_FOUND AND NOT DISABLE_LEAPMOTION)
     add_definitions(-DHAVE_LEAPMOTION)
@@ -221,6 +222,8 @@ if (LEAPMOTION_FOUND AND NOT DISABLE_LEAPMOTION)
     target_link_libraries(${TARGET_NAME} "${LEAPMOTION_LIBRARIES}")
 endif (LEAPMOTION_FOUND AND NOT DISABLE_LEAPMOTION)
 
+=======
+>>>>>>> origin/master
 # and with SDL for joysticks
 if (SDL_FOUND AND NOT DISABLE_SDL)
   add_definitions(-DHAVE_SDL)
diff --git a/interface/external/leapmotion/readme.txt b/interface/external/leapmotion/readme.txt
index 3abad9d7b1..665e0825d6 100644
--- a/interface/external/leapmotion/readme.txt
+++ b/interface/external/leapmotion/readme.txt
@@ -2,7 +2,8 @@
 Instructions for adding the Leap Motion library (LeapSDK) to Interface
 Sam Cake, June 10, 2014
 
-You can download the Leap Developer Kit from https://developer.leapmotion.com/ (account creation required). Interface has been tested with SDK version LeapDeveloperKit_2.0.2+16391_win.
+You can download the Leap Developer Kit from https://developer.leapmotion.com/ (account creation required).
+Interface has been tested with SDK version LeapDeveloperKit_2.0.2+16391_win.
 
 1. Copy the LeapSDK folders from the LeapDeveloperKit installation directory (Lib, Include) into the interface/externals/leapmotion folder.
    This readme.txt should be there as well.