diff --git a/main.go b/main.go
index 7c21e5a..d14ee23 100644
--- a/main.go
+++ b/main.go
@@ -81,10 +81,7 @@ func main() {
 		message, user, server, password, resource, alias string
 		oxPrivKey                                        *crypto.Key
 		recipients                                       []recipientsType
-<<<<<<< HEAD
 		groupchat                                        bool
-=======
->>>>>>> master
 	)
 
 	// Define command line flags.