diff --git a/emacs/.emacs b/emacs/.emacs
index c38ff87..4986f5a 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -139,25 +139,17 @@
   (evil-mode 1)
   (setq evil-ex-substitute-global t)
   (define-key evil-normal-state-map "/" 'swiper)
-<<<<<<< HEAD
-(define-key evil-motion-state-map [down-mouse-1] 'silence)
-(define-key evil-motion-state-map [mouse-1] 'silence)
-(setq-default evil-cross-lines t))
-=======
-  (setq-default evil-cross-lines t)
-  (define-key evil-insert-state-map (kbd "<up>") 'nope)
-  (define-key evil-insert-state-map (kbd "<left>") 'nope)
-  (define-key evil-insert-state-map (kbd "<right>") 'nope)
-  (define-key evil-insert-state-map (kbd "<down>") 'nope))
->>>>>>> 88de92aa599c6c9f35ce00728ce948fcd63e5682
+  (define-key evil-motion-state-map [down-mouse-1] 'silence)
+  (define-key evil-motion-state-map [mouse-1] 'silence)
+  (setq-default evil-cross-lines t))
 
 ;; Auto-Complete
 (use-package auto-complete
   :ensure t
   :demand t
   :config (progn
-			(require 'auto-complete-config)
-			(ac-config-default)))
+	    (require 'auto-complete-config)
+	    (ac-config-default)))
 
 ;; ivy
 (use-package ivy