diff --git a/lib/main.dart b/lib/main.dart
index 36add47dc..6be6edc91 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -22,7 +22,7 @@ void main() async {
 
   // #Pangea
   try {
-    await dotenv.load(fileName: ".env.local_choreo");
+    await dotenv.load(fileName: ".env");
   } catch (e) {
     Logs().e('Failed to load .env file', e);
   }
diff --git a/lib/pangea/widgets/chat/tts_controller.dart b/lib/pangea/widgets/chat/tts_controller.dart
index 2ced099c6..9acc7f7f8 100644
--- a/lib/pangea/widgets/chat/tts_controller.dart
+++ b/lib/pangea/widgets/chat/tts_controller.dart
@@ -35,20 +35,10 @@ class TtsController {
       debugPrint("voices: $voices");
       availableLangCodes = (voices as List)
           .map((v) {
-<<<<<<< Updated upstream
             // on iOS / web, the codes are in 'locale', but on Android, they are in 'name'
             final nameCode = v['name']?.split("-").first;
             final localeCode = v['locale']?.split("-").first;
             return nameCode.length == 2 ? nameCode : localeCode;
-=======
-            debugPrint('v: $v');
-
-            //@ggurdin i changed this from name to locale
-            //in my testing, that's where the language code is stored
-            // maybe it's different for different devices? was it different in your android testing?
-            // return v['name']?.split("-").first;
-            return v['locale']?.split("-").first;
->>>>>>> Stashed changes
           })
           .toSet()
           .cast<String>()