diff --git a/emacs/.emacs b/emacs/.emacs
index cb61005..c38ff87 100644
--- a/emacs/.emacs
+++ b/emacs/.emacs
@@ -1,6 +1,11 @@
 (package-initialize)
 (require 'package)
 
+;; Nope function
+(defun nope ()
+  (interactive)
+  (message "Nope!"))
+
 ;; Quote
 (setq initial-scratch-message ";; Simplicity and elegance are unpopular because\n;; they require hard work and discipline to achieve\n;; and education to be appreciated.\n;;\n;; - Dijkstra\n\n")
 
@@ -17,6 +22,8 @@
 (defun silence ()
   (interactive))
 
+;; Disable backup
+(setq make-backup-files nil)
 
 (push '("melpa" . "http://melpa.milkbox.net/packages/") package-archives)
 
@@ -123,6 +130,7 @@
 (use-package org
   :ensure t)
 
+
 ;; Evil-mode
 (use-package evil
   :ensure t
@@ -131,9 +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
 
 ;; Auto-Complete
 (use-package auto-complete
diff --git a/zsh/.zsh/10-helpers.zsh b/zsh/.zsh/10-helpers.zsh
index 799035d..29a9c93 100644
--- a/zsh/.zsh/10-helpers.zsh
+++ b/zsh/.zsh/10-helpers.zsh
@@ -28,3 +28,10 @@ gitall() {
 md5dir() {
     find $1 -type f -print0 | xargs -0 md5sum
 }
+
+ssh-fingerprint() {
+	SERVER=$1
+	PORT=${2:-22}
+
+	ssh-keygen -lf <(ssh-keyscan -p $PORT $SERVER 2>/dev/null)
+}