diff --git a/main.go b/main.go
index 5c867da..2199ca8 100644
--- a/main.go
+++ b/main.go
@@ -24,12 +24,7 @@ func init() {
 }
 
 func main() {
-<<<<<<< HEAD
-	logger.Web.Println("test")
-	logger.Web.Println("hey")
-=======
 	logger.Web.Println("test helloo")
->>>>>>> unstable
 
 	web.RunServer()
 	go web.Test()