diff --git a/3.0/modules/user_info/module.info b/3.0/modules/user_info/module.info
index ec6e6b0d..2dabd3d9 100644
--- a/3.0/modules/user_info/module.info
+++ b/3.0/modules/user_info/module.info
@@ -1,7 +1,3 @@
 name = "User Info"
 description = "Login Information"
-<<<<<<< HEAD
 version = 2
-=======
-version = 1
->>>>>>> d537136570ba6c51df8b572901e395018d9ef629