diff --git a/client/expected/90_permissions_test.out b/client/expected/90_permissions_test.out
index 6adb4dd..00124ec 100644
--- a/client/expected/90_permissions_test.out
+++ b/client/expected/90_permissions_test.out
@@ -80,7 +80,6 @@ CONTEXT:  SQL statement "SELECT cdb_geocoder_client._geocode_ipaddress_point(ses
 PL/pgSQL function cdb_geocoder_client.geocode_ipaddress_point(text) line 5 at SQL statement
  geocode_ipaddress_point 
 -------------------------
-
  
 (1 row)
 
@@ -101,13 +100,5 @@ SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666'
 ERROR:  permission denied for function _geocode_postalcode_polygon
 SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell');
 ERROR:  permission denied for function _geocode_postalcode_point
-<<<<<<< HEAD
 SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8');
 ERROR:  permission denied for function _geocode_ipaddress_point
--- Check the regular user cannot look into config table
-SELECT * from cdb_geocoder_client._config;
-ERROR:  permission denied for relation _config
-=======
-SELECT cdb_geocoder_client._geocode_ip('evil_user', 666, '8.8.8.8');
-ERROR:  permission denied for function _geocode_ip
->>>>>>> b977277052c9bf387b2f28a4720a071a08e8e821
diff --git a/client/sql/90_permissions_test.sql b/client/sql/90_permissions_test.sql
index ecbc466..bab2ee1 100644
--- a/client/sql/90_permissions_test.sql
+++ b/client/sql/90_permissions_test.sql
@@ -23,6 +23,3 @@ SELECT cdb_geocoder_client._geocode_namedplace_point('evil_user', 666, 'Sheol',
 SELECT cdb_geocoder_client._geocode_postalcode_polygon('evil_user', 666, '66666', 'Hell');
 SELECT cdb_geocoder_client._geocode_postalcode_point('evil_user', 666, '66666', 'Hell');
 SELECT cdb_geocoder_client._geocode_ipaddress_point('evil_user', 666, '8.8.8.8');
-
--- Check the regular user cannot look into config table
-SELECT * from cdb_geocoder_client._config;