diff --git a/vimrc b/vimrc
index c13ddad..153cebe 100644
--- a/vimrc
+++ b/vimrc
@@ -339,18 +339,6 @@ augroup AutoSaveFolds
   autocmd BufWinEnter *.* silent loadview
 augroup END
 
-<<<<<<< HEAD
-" set custom syntax highlighting
-augroup syntaxhighlighting
-  autocmd BufNewFile,BufRead *.html set syntax=html_custom
-  autocmd BufNewFile,BufRead *.php set syntax=php_custom
-  autocmd BufNewFile,BufRead *.vue set syntax=vue_custom
-  autocmd BufNewFile,BufRead *.vue syntax sync fromstart
-  autocmd BufNewFile,BufRead *.js set syntax=pangloss_javascript_custom
-augroup END
-
-=======
->>>>>>> new-syntax
 " fix higlight problems such as vertical-align etc
 augroup VimCSS3Syntax
   autocmd!