manifest fix

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.example.vip">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -11,22 +8,14 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-<<<<<<< HEAD
-        <activity android:name=".SplashActivity" android:theme="@style/SplashTheme">
-=======
         <activity android:name=".SignInActivity"></activity>
         <activity android:name=".SignUpActivity" />
-        <activity android:name=".MainActivity">
->>>>>>> 30e9555883e1f0d8a1af31b839e6ed410407101f
+        <activity android:name=".MainActivity"/>
+        <activity android:name=".SplashActivity" android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".MainActivity">
-
-        </activity>
     </application>
-
 </manifest>
\ No newline at end of file