fix: Conflict

Author: chopper985

lib/core/utils/audio/meeting_sound.dart

@@ -3,7 +3,6 @@ import 'package:injectable/injectable.dart';
 
 import 'package:waterbus/features/app/bloc/bloc.dart';
 import 'package:waterbus/features/settings/domain/entities/notification_settings.dart';
-import 'package:waterbus/features/settings/presentation/xmodels/notification_settings.dart';
 import 'package:waterbus/gen/assets.gen.dart';
 
 @singleton

lib/features/app/bloc/bloc.dart

@@ -11,7 +11,7 @@ import 'package:waterbus/features/room/presentation/bloc/beauty_filters/beauty_f
 import 'package:waterbus/features/room/presentation/bloc/recent_joined/recent_joined_bloc.dart';
 import 'package:waterbus/features/room/presentation/bloc/room/room_bloc.dart';
 import 'package:waterbus/features/settings/presentation/bloc/notification_setting_bloc.dart';
-import 'package:waterbus/features/settings/themes/bloc/themes_bloc.dart';
+import 'package:waterbus/features/settings/presentation/bloc/themes/themes_bloc.dart';
 
 class AppBloc {
   static final HomeBloc homeBloc = getIt<HomeBloc>();

lib/features/home/presentation/widgets/join_room_actions.dart

@@ -14,8 +14,8 @@ import 'package:waterbus/features/app/bloc/bloc.dart';
 import 'package:waterbus/features/auth/presentation/bloc/auth_bloc.dart';
 import 'package:waterbus/features/common/widgets/gesture_wrapper.dart';
 import 'package:waterbus/features/common/widgets/textfield/text_field_input.dart';
-import 'package:waterbus/features/conversation/xmodels/string_extension.dart';
-import 'package:waterbus/features/room/data/datasources/meeting_local_datasource.dart';
+import 'package:waterbus/features/conversation/domain/entities/string_extension.dart';
+import 'package:waterbus/features/room/data/datasources/meeting_local_data_source.dart';
 import 'package:waterbus/features/room/presentation/bloc/room/room_bloc.dart';
 
 class JoinRoomActions extends StatefulWidget {

lib/features/settings/data/datasource/notification_setting_local.dart

@@ -2,7 +2,7 @@ import 'package:hive_ce/hive.dart';
 import 'package:injectable/injectable.dart';
 
 import 'package:waterbus/core/constants/storage_keys.dart';
-import 'package:waterbus/features/settings/presentation/xmodels/notification_settings.dart';
+import 'package:waterbus/features/settings/domain/entities/notification_settings.dart';
 
 abstract class NotificationSettingLocal {
   NotificationSettings get getNotificationSettings;

lib/features/settings/presentation/bloc/notification_setting_bloc.dart

@@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:injectable/injectable.dart';
 
 import 'package:waterbus/features/settings/data/datasource/notification_setting_local.dart';
-import 'package:waterbus/features/settings/presentation/xmodels/notification_settings.dart';
+import 'package:waterbus/features/settings/domain/entities/notification_settings.dart';
 
 part 'notification_setting_event.dart';
 part 'notification_setting_state.dart';

lib/features/settings/presentation/screens/notification_settings_screen.dart

@@ -9,10 +9,9 @@ import 'package:waterbus/features/app/bloc/bloc.dart';
 import 'package:waterbus/features/common/styles/style.dart';
 import 'package:waterbus/features/common/widgets/app_bar_title_back.dart';
 import 'package:waterbus/features/settings/domain/entities/notification_settings.dart';
-import 'package:waterbus/features/settings/presentation/bloc/notification_setting/notification_setting_bloc.dart';
+import 'package:waterbus/features/settings/presentation/bloc/notification_setting_bloc.dart';
 import 'package:waterbus/features/settings/presentation/widgets/label_widget.dart';
 import 'package:waterbus/features/settings/presentation/widgets/setting_switch_card.dart';
-import 'package:waterbus/features/settings/presentation/xmodels/notification_settings.dart';
 
 class NotificationSettingsScreen extends StatelessWidget {
   const NotificationSettingsScreen({super.key});