diff --git a/about.html b/about.html
index 656f005..5dce2db 100644
--- a/about.html
+++ b/about.html
@@ -1,2 +1,7 @@
+<<<<<<< HEAD
 about what?
 
+=======
+about
+more bla bla
+>>>>>>> origin/main