fix merge conflicts

Author: gin0115

themes/osi/functions.php

@@ -426,10 +426,6 @@ function osi_wpdc_comment_body( string $comment_body ) {
 }
 add_filter( 'wpdc_comment_body', 'osi_wpdc_comment_body', 10, 1 );
 
-<<<<<<< HEAD
-
-=======
->>>>>>> develop-rm
 function osi_register_block_template() {
     $post_type = 'page'; // Assign the template to pages
     $template_slug = 'ai-template';
@@ -450,23 +446,15 @@ function osi_register_block_template() {
         if (get_page_template_slug() === 'templates/ai-template.html' || get_page_template_slug() === 'templates/ai-fse.php') {
             // Font Awesome - Updated to latest version
             wp_enqueue_style('fontawesome', 'https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.5.1/css/all.min.css', array(), '6.5.1');
-<<<<<<< HEAD
 
-=======
-            
->>>>>>> develop-rm
             // Other CSS files
             wp_enqueue_style('swiper', 'https://opensourceorg.github.io/ai/assets/css/plugins/swiper.css', array(), '1.0.0');
             wp_enqueue_style('unicons', 'https://opensourceorg.github.io/ai/assets/css/plugins/unicons.css', array(), '1.0.0');
             wp_enqueue_style('metismenu', 'https://opensourceorg.github.io/ai/assets/css/plugins/metismenu.css', array(), '1.0.0');
             wp_enqueue_style('animate', 'https://opensourceorg.github.io/ai/assets/css/vendor/animate.css', array(), '1.0.0');
             wp_enqueue_style('bootstrap', 'https://opensourceorg.github.io/ai/assets/css/vendor/bootstrap.min.css', array(), '1.0.0');
             wp_enqueue_style('ai-custom', 'https://opensourceorg.github.io/ai/assets/css/style.css', array('bootstrap'), '1.0.0');
-<<<<<<< HEAD
 
-=======
-            
->>>>>>> develop-rm
             // JavaScript files - with proper dependencies
             wp_enqueue_script('jquery');
             wp_enqueue_script('jqueryui', 'https://opensourceorg.github.io/ai/assets/js/vendor/jqueryui.js', array('jquery'), '1.0.0', true);
@@ -568,7 +556,6 @@ function osi_handle_supporter_form_flamingo_spam_status_change( string $new_stat
 		}
 	}
 }
-<<<<<<< HEAD
 add_action( 'transition_post_status', 'osi_handle_supporter_form_flamingo_spam_status_change', 10, 3 );
 
 /**
@@ -580,6 +567,3 @@ function osi_register_ai_menu() {
 	register_nav_menu( 'ai', __( 'AI Menu', 'osi' ) );
 }
 add_action( 'after_setup_theme', 'osi_register_ai_menu' );
-=======
-add_action( 'transition_post_status', 'osi_handle_supporter_form_flamingo_spam_status_change', 10, 3 );
->>>>>>> develop-rm