diff --git a/.idea/modules.xml b/.idea/modules.xml
index abc31fc679bb491e423c03e7bd677ff03ed00d98..b5de344f40ad3c770f4a603c6a0b758f157a80ec 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,8 +2,8 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/android.iml" filepath="$PROJECT_DIR$/android.iml" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
+      <module fileurl="file://$PROJECT_DIR$/fitness.iml" filepath="$PROJECT_DIR$/fitness.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d1549808b5150874828537b4832b2fbc06592125..8c1b768c29e6f8c457db8d02b1601a55033c12c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,10 +1,7 @@
 <resources>
     <string name="app_name">FitnessDIY</string>
-<<<<<<< HEAD
     <string name="logo_sub">Do It Yourself</string>
-=======
     <string name="email">Email</string>
     <string name="password">Password</string>
     <string name="login">Login</string>
->>>>>>> 1eae9efeb4f06e5b2bc4295b06c363e1ea211597
 </resources>