diff --git a/modules/register/models/pending_user.php b/modules/register/models/pending_user.php
index d88fd7fa..5214c74c 100644
--- a/modules/register/models/pending_user.php
+++ b/modules/register/models/pending_user.php
@@ -17,17 +17,5 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
-<<<<<<< HEAD:modules/ldap/config/ldap.php
-$config = array(
-  "groups" => array("eng", "google", "prebuild", "guest"),
-  "everybody_group" => "guest",
-  "registered_users_group" => "google",
-  "admins" => array("mediratta"),
-  "url" => "ldaps://ldap.corp.google.com/",
-  "group_domain" => "ou=Posix,ou=Groups,dc=google,dc=com",
-  "user_domain" => "ou=People,dc=google,dc=com",
-);
-=======
 class Pending_user_Model extends ORM {
-}
->>>>>>> gallery3-contrib/master:modules/register/models/pending_user.php
+}
\ No newline at end of file