diff --git a/MoCha/Assets/Plugins/Android.meta b/MoCha/Assets/Plugins/Android.meta
deleted file mode 100644
index 7bc5691..0000000
--- a/MoCha/Assets/Plugins/Android.meta
+++ /dev/null
@@ -1,16 +0,0 @@
-fileFormatVersion: 2
-<<<<<<< Updated upstream
-guid: 8cd453422b2e32245b54c76a62e2a81e
-folderAsset: yes
-timeCreated: 1523387294
-=======
-guid: e306a28a11a4976488ab98bb77d05c1d
-folderAsset: yes
-timeCreated: 1523388046
->>>>>>> Stashed changes
-licenseType: Free
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/MoCha/Assets/Scenes/Main.unity b/MoCha/Assets/Scenes/Main.unity
index a77fda7..07fb2ac 100644
Binary files a/MoCha/Assets/Scenes/Main.unity and b/MoCha/Assets/Scenes/Main.unity differ
diff --git a/MoCha/ProjectSettings/ProjectSettings.asset b/MoCha/ProjectSettings/ProjectSettings.asset
index c203650..689b861 100644
Binary files a/MoCha/ProjectSettings/ProjectSettings.asset and b/MoCha/ProjectSettings/ProjectSettings.asset differ