fix: fixed analyzer issues and merge conflicts

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

@@ -40,7 +40,7 @@ class SettingsCubit extends Cubit<SettingsState> {
     }
   }
 
-  updateProfileDetails({
+  Future<void> updateProfileDetails({
     required ProfileDetailsModel profileDetailsModel,
   }) async {
     try {
@@ -54,7 +54,7 @@ class SettingsCubit extends Cubit<SettingsState> {
     }
   }
 
-  updateProfileSettings({
+  Future<void> updateProfileSettings({
     required ProfileSettingsModel profileSettingsModel,
   }) async {
     try {

lib/features/settings/presentation/pages/general_info_screen.dart

@@ -151,7 +151,7 @@ class _GeneralInfoScreenState extends State<GeneralInfoScreen> {
     );
   }
 
-  onTapCalendar(BuildContext context) {
+  Null Function() onTapCalendar(BuildContext context) {
     return () {
       _showDialog(
         CupertinoDatePicker(
@@ -187,7 +187,7 @@ class _GeneralInfoScreenState extends State<GeneralInfoScreen> {
     );
   }
 
-  _saveButton() {
+  InkWell _saveButton() {
     return InkWell(
       onTap: () {
         widget.settingsEntity.settingsCubit.updateProfileDetails(

lib/features/settings/presentation/pages/other_info_screen.dart

@@ -129,7 +129,7 @@ class _OtherInfoScreenState extends State<OtherInfoScreen> {
     );
   }
 
-  _saveButton() {
+  InkWell _saveButton() {
     return InkWell(
       onTap: () {
         widget.settingsEntity.settingsCubit.updateProfileDetails(

lib/features/settings/presentation/pages/physical_activity_screen.dart

@@ -116,7 +116,7 @@ class _PhysicalActivityScreenState extends State<PhysicalActivityScreen> {
     );
   }
 
-  _saveButton() {
+  InkWell _saveButton() {
     return InkWell(
       onTap: () {
         late final double activityCoefficient;

lib/features/settings/presentation/pages/physical_form_screen.dart

@@ -100,7 +100,7 @@ class _PhysicalFormScreenState extends State<PhysicalFormScreen> {
     );
   }
 
-  _saveButton() {
+  InkWell _saveButton() {
     return InkWell(
       onTap: () {
         widget.settingsEntity.settingsCubit.updateProfileDetails(

lib/features/settings/presentation/pages/pressure_screen.dart

@@ -106,7 +106,7 @@ class _PressureScreenState extends State<PressureScreen> {
     );
   }
 
-  _saveButton() {
+  InkWell _saveButton() {
     return InkWell(
       onTap: () {
         widget.settingsEntity.settingsCubit.updateProfileDetails(

lib/features/settings/presentation/pages/settings_screen.dart

@@ -86,7 +86,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  _additionalInfo(SettingsStateLoaded state) {
+  Column _additionalInfo(SettingsStateLoaded state) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -189,7 +189,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  _notifications(SettingsStateLoaded state) {
+  Column _notifications(SettingsStateLoaded state) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -323,7 +323,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  _aboutEatvio(SettingsStateLoaded state) {
+  Column _aboutEatvio(SettingsStateLoaded state) {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
@@ -351,7 +351,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  _becomeConsultantButton(SettingsStateLoaded state) {
+  SingleChildRenderObjectWidget _becomeConsultantButton(SettingsStateLoaded state) {
     if (state.consultationRequestModel == null) {
       return Padding(
         padding: const EdgeInsets.symmetric(horizontal: 16) + const EdgeInsets.only(bottom: 8),
@@ -432,7 +432,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     return const SizedBox.shrink();
   }
 
-  _deleteAccountButton(SettingsStateLoaded state) {
+  Padding _deleteAccountButton(SettingsStateLoaded state) {
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 16),
       child: InkWell(
@@ -460,7 +460,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  _tile({
+  ListTile _tile({
     required String title,
     required Function() onTap,
     Widget? trailing,
@@ -486,7 +486,7 @@ class _SettingsScreenState extends State<SettingsScreen> {
     );
   }
 
-  _divider(BuildContext context) {
+  Center _divider(BuildContext context) {
     return Center(
       child: Container(
         height: 0.4,