diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 6aac67eb..77172b79 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <permission
+<<<<<<< HEAD
 <<<<<<< HEAD
         android:name="com.mgoogle.android.providers.gsf.permission.READ_GSERVICES"
         android:label="@string/perm_gsf_read_gservices_label"
@@ -25,6 +26,12 @@
     <permission
         android:name="com.mgoogle.android.c2dm.permission.RECEIVE"
 =======
+=======
+        android:name="${basePackageName}.android.providers.gsf.permission.READ_GSERVICES"
+        android:label="@string/perm_gsf_read_gservices_label"
+        android:protectionLevel="normal" />
+    <permission
+>>>>>>> caf7201f (Declare com.mgoogle.android.providers.gsf.permission.READ_GSERVICES permission https://github.com/microg/GmsCore/commit/833e2940f283eeda5eca23b3af898dbfbab24d57)
         android:name="${basePackageName}.android.c2dm.permission.RECEIVE"
 >>>>>>> 25329625 (Set basePackageName)
         android:label="@string/perm_c2dm_receive_label"
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
index c27278b1..c08c652d 100755
--- a/play-services-core/src/main/res/values/strings.xml
+++ b/play-services-core/src/main/res/values/strings.xml
@@ -41,6 +41,7 @@ This can take a couple of minutes."</string>
 
     <string name="perm_gsf_read_gservices_label">read Google service configuration</string>
     <string name="perm_status_broadcast_label">listen to internal status broadcasts</string>
+    <string name="perm_gsf_read_gservices_label">read Google service configuration</string>
     <string name="perm_c2dm_receive_label">listen to C2DM messages</string>
     <string name="perm_c2dm_send_label">send C2DM messages to other apps</string>
     <string name="perm_gtalk_svc_label">exchange messages and receive sync notifications from Google servers</string>