diff --git a/.gitignore b/.gitignore
index c0d6d3831..8bd30e1de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,4 +188,7 @@ ipch/
 Ankh.NoLoad
 
 # RN New Version App Generation
-Examples/testapp_rn
\ No newline at end of file
+Examples/testapp_rn
+
+# Android debug build files (conflict ignoring #Visual Studio files)
+!android/app/src/debug/
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 000000000..8b06deb71
--- /dev/null
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,10 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.microsoft.codepush.react">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+
+    <application>
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    </application>
+
+</manifest>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 5bd15968b..9b2755f75 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -3,8 +3,4 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
 
-    <application>
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-    </application>
-
-</manifest>
\ No newline at end of file
+</manifest>