Fix merge conflict

emacs/.emacs.d/modules/jg-dev.el

@@ -99,6 +99,16 @@
 (use-package nix-mode
   :mode "\\.nix\\'")
 
+(use-package meson-mode
+  :ensure t)
+
+(use-package rustic
+  :ensure t
+  :config
+  (setq rustic-format-on-save nil)
+  :custom
+  (rustic-cargo-use-last-stored-arguments t))
+
 ;;(ac-config-default)
 ;;(require 'ac-geiser)
 ;;(;add-hook 'geiser-mode-hook 'ac-geiser-setup)