diff --git a/lib/src/resources/google_login_provider.dart b/lib/src/resources/google_login_provider.dart
index eac75ae..0e3525f 100644
--- a/lib/src/resources/google_login_provider.dart
+++ b/lib/src/resources/google_login_provider.dart
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 import 'dart:async';
 
 import 'package:firebase_auth/firebase_auth.dart';
@@ -27,6 +26,3 @@ class GoogleSignInProvider {
     return user;
   }
 }
-=======
-import 'package:firebase_auth/firebase_auth.dart';
->>>>>>> Added necessary dependencies for google sing in, created the google_sign_in provider, modified Info.plist to work with google sign in