diff --git a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
index b7766de..d180687 100644
--- a/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
+++ b/Code/LeudaemiaLikeMe/app/src/main/AndroidManifest.xml
@@ -9,14 +9,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.LeudaemiaLikeMe">
-<<<<<<< HEAD
         <activity android:name=".SendInvitationActivity"></activity>
-        <activity android:name=".MainActivity">
-=======
         <activity android:name=".Activity.GoAnswerActivity"></activity>
         <activity android:name=".Activity.SendQuestionActivity" />
         <activity android:name=".Activity.MainActivity">
->>>>>>> origin/master
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />