Fix merge conflict

ftplugin/markdown.vim

@@ -1,8 +1,11 @@
 set spell spellfile="~/.config/nvim/spell/wordlist"
 let g:markdown_fenced_languages = ['html', 'python', 'bash=sh', 'fortran']
-"set conceallevel=2
-"let g:vim_markdown_math = 1
-"let g:tex_conceal = "abdmg"
+set conceallevel=2
+let g:vim_markdown_math = 1
+let g:tex_conceal = "abdmg"
+let g:tex_superscripts= "[0-9a-zA-W.,:;+-<>/()=]"
+let g:tex_subscripts= "[0-9aehijklmnoprstuvx,+-/().]"
+let g:tex_conceal_frac=1
 hi clear Conceal
 map <C-b> : w % <Bar> AsyncRun md2pdf "%" <CR> 
 map <A-p> : w % <Bar> AsyncRun md2beamer "%" <CR> 

init.lua

@@ -262,8 +262,8 @@ require("lazy").setup({
 			repl_open_cmd = "horizontal bot 20 split"
 		end,
 	},
-	"vigoux/ltex-ls.nvim",
-	"tpope/vim-markdown",
+	"ixru/nvim-markdown",
+	"KeitaNakamura/tex-conceal.vim",
 	"christoomey/vim-tmux-navigator",
 	"skywind3000/asyncrun.vim",
 	-- NOTE: Plugins can specify dependencies.
@@ -272,7 +272,6 @@ require("lazy").setup({
 	-- you do for a plugin at the top level, you can do for a dependency.
 	--
 	-- Use the `dependencies` key to specify the dependencies of a particular plugin
-
 	{ -- Fuzzy Finder (files, lsp, etc)
 		"nvim-telescope/telescope.nvim",
 		event = "VeryLazy",