diff --git a/lib/ui/process_ui/new_process.dart b/lib/ui/process_ui/new_process.dart
index 4b6e584e0..2ae613fad 100644
--- a/lib/ui/process_ui/new_process.dart
+++ b/lib/ui/process_ui/new_process.dart
@@ -31,13 +31,11 @@ class NewProcess extends StatelessWidget {
         child: ElevatedButton(
           child: Text("CONTINUE"),
           onPressed: () {
-// <<<<<<< HEAD
             print(context.read<GlobalProvider>().fieldDisplayValues);
             // if (context.read<GlobalProvider>().newProcessTabIndex <
             //     newProcess.screens!.length - 1) {
             //   context.read<GlobalProvider>().newProcessTabIndex =
                   // context.read<GlobalProvider>().newProcessTabIndex + 1;
-// ======= 
             if (context.read<GlobalProvider>().newProcessTabIndex <
                   newProcess.screens!.length - 1) {
                 context.read<GlobalProvider>().newProcessTabIndex =
@@ -50,7 +48,6 @@ class NewProcess extends StatelessWidget {
             //     .validate()) {
               
             //   }
-// >>>>>>> new_registration_ui
             }
           },
         ),
diff --git a/lib/ui/process_ui/widgets/new_process_language_selection.dart b/lib/ui/process_ui/widgets/new_process_language_selection.dart
index f2851fce4..21d2f83f9 100644
--- a/lib/ui/process_ui/widgets/new_process_language_selection.dart
+++ b/lib/ui/process_ui/widgets/new_process_language_selection.dart
@@ -161,20 +161,6 @@ class NewProcessLanguageSelection extends StatelessWidget {
         ),
       ),
       actions: [
-// <<<<<<< HEAD
-//         OutlinedButton(
-//           onPressed: () {},
-//           child: Text("CANCEL"),
-//         ),
-//         ElevatedButton(
-//             onPressed: () {
-//               context.read<GlobalProvider>().fieldDisplayValues={};
-//               context.read<GlobalProvider>().fieldValues(newProcess);
-//               Navigator.pushNamed(context, NewProcess.routeName,
-//                   arguments: {"process": newProcess});
-//             },
-//             child: Text("SUBMIT"))
-// =======
         const Divider(),
         Row(
           children: [
@@ -202,7 +188,6 @@ class NewProcessLanguageSelection extends StatelessWidget {
             )
           ],
         )
-// >>>>>>> new_registration_ui
       ],
     );
   }
diff --git a/lib/ui/process_ui/widgets/new_process_screen_content.dart b/lib/ui/process_ui/widgets/new_process_screen_content.dart
index 57d565785..86d13d894 100644
--- a/lib/ui/process_ui/widgets/new_process_screen_content.dart
+++ b/lib/ui/process_ui/widgets/new_process_screen_content.dart
@@ -1,4 +1,3 @@
-// <<<<<<< HEAD
 import 'package:flutter/material.dart';
 import 'package:flutter/src/widgets/framework.dart';
 import 'package:flutter/src/widgets/placeholder.dart';
@@ -9,9 +8,7 @@ import 'package:registration_client/provider/global_provider.dart';
 import 'package:registration_client/ui/process_ui/widgets/custom_checkbox.dart';
 import 'package:registration_client/ui/process_ui/widgets/custom_html_box.dart';
 import 'package:registration_client/ui/process_ui/widgets/custom_preferred_lang_button.dart';
-// =======
 import 'dart:developer';
-// >>>>>>> new_registration_ui
 
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
@@ -143,17 +140,6 @@ class _NewProcessScreenContentState extends State<NewProcessScreenContent> {
 
   @override
   Widget build(BuildContext context) {
-// <<<<<<< HEAD
-//     return Column(
-    // children: [
-    //   ...screen.fields!.map((e){
-    //     if(e!.inputRequired == true){
-    //       return widgetType(e);
-    //     }
-    //     return Container();
-    //   }).toList(),
-//       ],
-// =======
     return context.watch<GlobalProvider>().newProcessTabIndex == 1
         ?Card(
             margin: const EdgeInsets.all(14),