   (setq-default js2-mode-show-parse-errors nil
                 js2-mode-show-strict-warnings nil)
   ;; ... but enable it if flycheck can't handle javascript
-  (autoload 'flycheck-get-checker-for-buffer "flycheck")
-  (defun sanityinc/disable-js2-checks-if-flycheck-active ()
-    (unless (flycheck-get-checker-for-buffer)
-      (set (make-local-variable 'js2-mode-show-parse-errors) t)
-      (set (make-local-variable 'js2-mode-show-strict-warnings) t)))
-  (add-hook 'js2-mode-hook 'sanityinc/disable-js2-checks-if-flycheck-active)
+
 
   (add-hook 'js2-mode-hook (lambda () (setq mode-name "JS2")))
 
+<<<<<<< 6d5ef5be0c09a0b8217831cc194019b5ec6647ef
+=======
+  (add-hook 'js-mode-hook 'js2-minor-mode)
+  (add-hook 'js2-mode-hook 'ac-js2-mode)
+
+  (setq-default
+   js2-basic-offset preferred-javascript-indent-level
+   js2-bounce-indent-p nil)
+
+>>>>>>> simplified (no clue what I am doing) and added some comments to shut up flycheck
   (after-load 'js2-mode
     (js2-imenu-extras-setup)))
 

(maybe-require-package 'json-mode)
(maybe-require-package 'js2-mode)
(maybe-require-package 'ac-js2)



(provide 'init-javascript)

;;; init-javascript.el ends here
