diff --git a/_config/nvim/UltiSnips/make.snippets b/_config/nvim/UltiSnips/make.snippets
index 03e50f9..39a4e5e 100644
--- a/_config/nvim/UltiSnips/make.snippets
+++ b/_config/nvim/UltiSnips/make.snippets
@@ -25,5 +25,3 @@ $1: $1.bo
 $1.bo: $1.bsv $(SRC)
 	bsc -aggressive-conditions -u -sim -g mk$1 $<
 endsnippet
-=======
->>>>>>> 2554c95 (Add snippets support)