diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57bdd3f5a..8d61a54f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,61 +69,11 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules")
 find_package(OpenGL REQUIRED)
 include_directories(${OPENGL_INCLUDE_DIR})
 
-<<<<<<< HEAD
-option(ENABLE_GLFW "Enable the GLFW frontend" ON)
-if (ENABLE_GLFW)
-    if (WIN32)
-        # Detect toolchain and platform
-        if (MSVC)
-            if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-                set(TMP_ARCH "x64")
-            elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
-                set(TMP_ARCH "Win32")
-            else()
-                set(TMP_ARCH "UNKNOWN")
-                message(SEND_ERROR "Couldn't detect your compiler's architecture, you'll have to manually specify the GLFW library to use. (Try checking CMakeOutput.log to find out why.)")
-            endif()
-
-            if (MSVC11) # Visual C++ 2012
-                set(TMP_TOOLSET "v110")
-            elseif (MSVC12) # Visual C++ 2013
-                set(TMP_TOOLSET "v120")
-            else()
-                set(TMP_TOOLSET "UNSUPPORTED")
-                message(SEND_ERROR "We don't supply GLFW binaries for your version of MSVC, you might have to provide them yourself.")
-            endif()
-
-            set(TMP_TOOLSET "msvc_${TMP_TOOLSET}-${TMP_ARCH}")
-        else()
-            # Assume mingw
-            if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-                set(TMP_ARCH "x86_64")
-            elseif (CMAKE_SIZEOF_VOID_P EQUAL 4)
-                set(TMP_ARCH "i686")
-            else()
-                set(TMP_ARCH "UNKNOWN")
-                message(SEND_ERROR "Couldn't detect your compiler's architecture, you'll have to manually specify the GLFW library to use.")
-            endif()
-
-            set(TMP_TOOLSET "mingw-${TMP_ARCH}")
-        endif()
-
-        set(GLFW_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/externals/glfw-3.1.1.bin")
-        set(GLFW_INCLUDE_DIRS "${GLFW_PREFIX}/include" CACHE PATH "Path to GLFW3 headers")
-        set(GLFW_LIBRARY_DIRS "${GLFW_PREFIX}/lib-${TMP_TOOLSET}" CACHE PATH "Path to GLFW3 libraries")
-
-        # Clean up after ourselves
-        unset(TMP_TOOLSET)
-        unset(TMP_ARCH)
-
-        set(GLFW_LIBRARIES glfw3)
-    else()
-        find_package(PkgConfig REQUIRED)
-        pkg_search_module(GLFW REQUIRED glfw3)
-    endif()
-
-    include_directories(${GLFW_INCLUDE_DIRS})
-    link_directories(${GLFW_LIBRARY_DIRS})
+find_package(SDL2 REQUIRED)
+if (SDL2_FOUND)
+    include_directories(${SDL2_INCLUDE_DIRS})
+else()
+    message(STATUS "SDL2 not found.")
 endif()
 
 IF (APPLE)
@@ -146,15 +96,6 @@ ELSE()
     set(PLATFORM_LIBRARIES rt)
 ENDIF (APPLE)
 
-=======
-find_package(SDL2 REQUIRED)
-if (SDL2_FOUND)
-    include_directories(${SDL2_INCLUDE_DIRS})
-else()
-    message(STATUS "SDL2 not found.")
-endif()
-
->>>>>>> Have SDL2 as a project dependency
 option(ENABLE_QT "Enable the Qt frontend" ON)
 option(CITRA_FORCE_QT4 "Use Qt4 even if Qt5 is available." OFF)
 if (ENABLE_QT)
diff --git a/src/citra/config.cpp b/src/citra/config.cpp
index 74c413f05..f9dde8b55 100644
--- a/src/citra/config.cpp
+++ b/src/citra/config.cpp
@@ -66,15 +66,10 @@ void Config::ReadValues() {
     Settings::values.pad_cright_key = sdl_config->GetInteger("Controls", "pad_cright", SDL_SCANCODE_L);
 
     // Core
-<<<<<<< HEAD
-    Settings::values.frame_skip = glfw_config->GetInteger("Core", "frame_skip", 0);
-=======
-    Settings::values.gpu_refresh_rate = sdl_config->GetInteger("Core", "gpu_refresh_rate", 30);
     Settings::values.frame_skip = sdl_config->GetInteger("Core", "frame_skip", 0);
->>>>>>> Have SDL2 as a project dependency
 
     // Renderer
-    Settings::values.use_hw_renderer = sdl_config->GetBoolean("Renderer", "use_hw_renderer", true);
+    Settings::values.use_hw_renderer = sdl_config->GetBoolean("Renderer", "use_hw_renderer", false);
 
     Settings::values.bg_red   = (float)sdl_config->GetReal("Renderer", "bg_red",   1.0);
     Settings::values.bg_green = (float)sdl_config->GetReal("Renderer", "bg_green", 1.0);