diff --git a/src/components/Account.tsx b/src/components/Account.tsx
index 4e843e26..1a7de129 100644
--- a/src/components/Account.tsx
+++ b/src/components/Account.tsx
@@ -1,9 +1,9 @@
 import { useState, useEffect } from 'react';
-import supabase from '../utils/supabase';
 import { StyleSheet, View, Alert, ScrollView } from 'react-native';
 import { Button, Input } from 'react-native-elements';
 import { Session } from '@supabase/supabase-js';
 import DateTimePicker from '@react-native-community/datetimepicker';
+import supabase from '../utils/supabase';
 import UserStringInput from './UserStringInput';
 
 const styles = StyleSheet.create({
diff --git a/src/components/Login.tsx b/src/components/Login.tsx
index 6593879e..9304f827 100644
--- a/src/components/Login.tsx
+++ b/src/components/Login.tsx
@@ -1,12 +1,7 @@
 import React, { useState } from 'react';
 import { Alert, StyleSheet, View } from 'react-native';
-<<<<<<< HEAD
-import supabase from '../utils/supabase';
-import { Button, Input } from 'react-native-elements';
-=======
 import { Button, Input } from 'react-native-elements';
 import supabase from '../utils/supabase';
->>>>>>> 142e05f30de7c365f135becc2ab6a97884ef93fe
 
 const styles = StyleSheet.create({
   container: {
diff --git a/src/screens/LoginScreen.tsx b/src/screens/LoginScreen.tsx
index 7aff0c5f..a8450ac6 100644
--- a/src/screens/LoginScreen.tsx
+++ b/src/screens/LoginScreen.tsx
@@ -1,8 +1,8 @@
 import 'react-native-url-polyfill/auto';
 import { useState, useEffect } from 'react';
-import supabase from '../utils/supabase';
 import { View } from 'react-native';
 import { Session } from '@supabase/supabase-js';
+import supabase from '../utils/supabase';
 import Login from '../components/Login';
 import Account from '../components/Account';