diff --git a/_config/nvim/UltiSnips/cpp.snippets b/_config/nvim/UltiSnips/cpp.snippets
index 1bab6bf..7eb9ba6 100644
--- a/_config/nvim/UltiSnips/cpp.snippets
+++ b/_config/nvim/UltiSnips/cpp.snippets
@@ -1,4 +1,5 @@
 snippet main
+<<<<<< HEAD
 #include <iostream>
 
 using namespace std;
@@ -18,6 +19,12 @@ using namespace osh;
 
 int main() {
     println("Hello, World!");
+=======
+#include <stdio.h>
+#include <stdlib.h>
+
+int main() {
+    printf("Hello, World!\n");
 
     return 0; 
 }