diff --git a/xCAT-server/lib/xcat/plugins/openbmc.pm b/xCAT-server/lib/xcat/plugins/openbmc.pm
index ab171aac2..153792d88 100644
--- a/xCAT-server/lib/xcat/plugins/openbmc.pm
+++ b/xCAT-server/lib/xcat/plugins/openbmc.pm
@@ -808,7 +808,6 @@ sub parse_command_status {
 
     if ($command eq "rflash") {
         my $check_version = 0;
-<<<<<<< HEAD
         my $list = 0;
         my $delete = 0;
         my $upload = 0;