diff --git a/lib/main.dart b/lib/main.dart
index 87d113fd..3ec99bc4 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -49,8 +49,13 @@ class OpSoApp extends StatelessWidget {
             builder: (theme, darkTheme) => MaterialApp(
               initialRoute: '/splash_screen',
               routes: {
+<<<<<<< HEAD
+                "/program_page": (context) => const HomePage(),
+                "/girl_script_summer_of_code": (context) => const GSSOCScreen(),
+=======
                 "/progarm_page": (context) => const HomePage(),
                 "/girl_script_summer_of_code": (context)=> const GSSOCScreen(),
+>>>>>>> upstream/main
                 "/social_winter_of_code": (context) => const SWOCScreen(),
                 "/season_of_kde": (context) => const SeasonOfKDE(),
                 "/google_summer_of_code": (context) =>
diff --git a/lib/programs screen/open_summer_of_code.dart b/lib/programs screen/open_summer_of_code.dart
index 92b13221..194bc646 100644
--- a/lib/programs screen/open_summer_of_code.dart	
+++ b/lib/programs screen/open_summer_of_code.dart	
@@ -278,7 +278,7 @@ class _OpenSummerOfCodeState extends State<OpenSummerOfCode> {
                   ),
                 );
               } else {
-                return const Center(child: Text("Some error occured"));
+                return const Center(child: Text("Some error occurred"));
               }
             }),
       ),
diff --git a/lib/splash_screen.dart b/lib/splash_screen.dart
index 97be098c..917be364 100644
--- a/lib/splash_screen.dart
+++ b/lib/splash_screen.dart
@@ -11,7 +11,7 @@ class _SplashScreenState extends State<SplashScreen> {
   void initState() {
     super.initState();
     Timer(Duration(seconds: 3), () {
-      Navigator.of(context).pushReplacementNamed('/progarm_page');
+      Navigator.of(context).pushReplacementNamed('/program_page');
     });
   }