diff --git a/MoCha/Assets/Scenes/Home.unity b/MoCha/Assets/Scenes/Home.unity
index a6951d8..2066e31 100644
Binary files a/MoCha/Assets/Scenes/Home.unity and b/MoCha/Assets/Scenes/Home.unity differ
diff --git a/MoCha/Assets/Scenes/StepCounter.unity.meta b/MoCha/Assets/Scenes/StepCounter.unity.meta
index b9cc508..535bf2c 100644
--- a/MoCha/Assets/Scenes/StepCounter.unity.meta
+++ b/MoCha/Assets/Scenes/StepCounter.unity.meta
@@ -1,15 +1,8 @@
 fileFormatVersion: 2
 guid: e5fcab55ab6a24d8eb5dd6198b597019
-<<<<<<< HEAD
 timeCreated: 1497532216
 licenseType: Pro
 DefaultImporter:
-=======
-timeCreated: 1523382829
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
->>>>>>> alex
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta b/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta
index a7829bd..a23005d 100644
--- a/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta
+++ b/MoCha/Assets/Scripts/CustomAndroidPlugin.cs.meta
@@ -1,11 +1,6 @@
 fileFormatVersion: 2
-<<<<<<< Updated upstream
 guid: 80685d60eb42cd340a5c76d410187801
 timeCreated: 1524716619
-=======
-guid: 1d9a971c325c98e4a81ea4ec2e52aed6
-timeCreated: 1524756178
->>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}
diff --git a/MoCha/Assets/Scripts/FitBitAPI.cs.meta b/MoCha/Assets/Scripts/FitBitAPI.cs.meta
index beb83a4..8514324 100644
--- a/MoCha/Assets/Scripts/FitBitAPI.cs.meta
+++ b/MoCha/Assets/Scripts/FitBitAPI.cs.meta
@@ -1,11 +1,6 @@
 fileFormatVersion: 2
-<<<<<<< Updated upstream
 guid: aa5e856e9b878764db7c192f3aa20277
 timeCreated: 1524716713
-=======
-guid: 849590d4a954ae445aa5db73d734450c
-timeCreated: 1524756213
->>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}
diff --git a/MoCha/Assets/Scripts/FitbitData.cs.meta b/MoCha/Assets/Scripts/FitbitData.cs.meta
index e0b1ea8..add5ba3 100644
--- a/MoCha/Assets/Scripts/FitbitData.cs.meta
+++ b/MoCha/Assets/Scripts/FitbitData.cs.meta
@@ -1,11 +1,6 @@
 fileFormatVersion: 2
-<<<<<<< Updated upstream
 guid: 7a928c029cb14204588724261a513ec1
 timeCreated: 1524716713
-=======
-guid: 1d8622418b8bead4cad17658d650c6c2
-timeCreated: 1524756213
->>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}
diff --git a/MoCha/Assets/Scripts/JSONObject.cs.meta b/MoCha/Assets/Scripts/JSONObject.cs.meta
index 7347c44..c095bab 100644
--- a/MoCha/Assets/Scripts/JSONObject.cs.meta
+++ b/MoCha/Assets/Scripts/JSONObject.cs.meta
@@ -1,11 +1,6 @@
 fileFormatVersion: 2
-<<<<<<< Updated upstream
 guid: da64cad21a33a6444ac511376fcb771b
 timeCreated: 1524716713
-=======
-guid: 9101b04121334074fb6e70fc34eeb3f9
-timeCreated: 1524756213
->>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}
diff --git a/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta b/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta
index ba51381..320c6d8 100644
--- a/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta
+++ b/MoCha/Assets/Scripts/OAuth2AccessToken.cs.meta
@@ -1,11 +1,6 @@
 fileFormatVersion: 2
-<<<<<<< Updated upstream
 guid: 2e4069fa83cbbb041aa91e83f7ece28e
 timeCreated: 1524716713
-=======
-guid: 1d4c10710438d404085599a6fe50d37b
-timeCreated: 1524756213
->>>>>>> Stashed changes
 licenseType: Free
 MonoImporter:
   externalObjects: {}