diff --git a/lib/pages/home/bloc/home_bloc.dart b/lib/pages/home/bloc/home_bloc.dart
index 7645b03c..c1bcba6a 100644
--- a/lib/pages/home/bloc/home_bloc.dart
+++ b/lib/pages/home/bloc/home_bloc.dart
@@ -19,11 +19,7 @@ class HomeBloc extends Bloc<HomeEvent, HomeState> {
   String terms = '';
   String policy = '';
 
-<<<<<<< SP-1737-FE-The-user-appears-as-Null-and-the-project-uuid-is-null-when-we-login-in-after-a-credentials-error
   HomeBloc() : super(HomeInitial()) {
-=======
-  HomeBloc() : super((HomeInitial())) {
->>>>>>> dev
     on<FetchUserInfo>(_fetchUserInfo);
     on<FetchTermEvent>(_fetchTerms);
     on<FetchPolicyEvent>(_fetchPolicy);