diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
index 433cb2fa269..b55bd49f431 100644
--- a/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
+++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.cpp
@@ -558,11 +558,8 @@ JfrConfigureFlightRecorderDCmd::JfrConfigureFlightRecorderDCmd(outputStream* out
   _memory_size("memorysize", "Overall memory size, ", "MEMORY SIZE", false, "10m"),
   _max_chunk_size("maxchunksize", "Size of an individual disk chunk", "MEMORY SIZE", false, "12m"),
   _sample_threads("samplethreads", "Activate Thread sampling", "BOOLEAN", false, "true"),
-<<<<<<< HEAD
   _sample_object_allocations("sampleobjectallocations","object allocations sampling enable / disable", "BOOLEAN", false, "false"),
   _object_allocations_sampling_interval("objectallocationssamplinginterval", "object allocations sampling interval", "JLONG", false, "1024"),
-=======
->>>>>>> jdk-11.0.22+7
   _verbose(true) {
   _dcmdparser.add_dcmd_option(&_repository_path);
   _dcmdparser.add_dcmd_option(&_dump_path);
@@ -664,11 +661,7 @@ void JfrConfigureFlightRecorderDCmd::execute(DCmdSource source, TRAPS) {
 
   static const char klass[] = "jdk/jfr/internal/dcmd/DCmdConfigure";
   static const char method[] = "execute";
-<<<<<<< HEAD
   static const char signature[] = "(ZLjava/lang/Boolean;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Integer;"
-=======
-  static const char signature[] = "(ZLjava/lang/String;Ljava/lang/String;Ljava/lang/Integer;"
->>>>>>> jdk-11.0.22+7
     "Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;Ljava/lang/Long;"
     "Ljava/lang/Long;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Long;)Ljava/lang/String;";
 
@@ -677,10 +670,7 @@ void JfrConfigureFlightRecorderDCmd::execute(DCmdSource source, TRAPS) {
 
   // params
   execute_args.push_int(_verbose ? 1 : 0);
-<<<<<<< HEAD
   execute_args.push_jobject(on_vm_start);
-=======
->>>>>>> jdk-11.0.22+7
   execute_args.push_jobject(repository_path);
   execute_args.push_jobject(dump_path);
   execute_args.push_jobject(stack_depth);
diff --git a/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp b/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
index fb900a63600..768488d00ec 100644
--- a/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
+++ b/src/hotspot/share/jfr/dcmd/jfrDcmds.hpp
@@ -155,11 +155,8 @@ class JfrConfigureFlightRecorderDCmd : public DCmdWithParser {
   DCmdArgument<MemorySizeArgument> _memory_size;
   DCmdArgument<MemorySizeArgument> _max_chunk_size;
   DCmdArgument<bool>  _sample_threads;
-<<<<<<< HEAD
   DCmdArgument<bool>  _sample_object_allocations;
   DCmdArgument<jlong> _object_allocations_sampling_interval;
-=======
->>>>>>> jdk-11.0.22+7
   bool _verbose;
 
  public:
diff --git a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp
index 41a8c02dd9d..34971cd7f18 100644
--- a/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp
+++ b/src/hotspot/share/jfr/recorder/service/jfrOptionSet.cpp
@@ -406,15 +406,12 @@ bool JfrOptionSet::configure(TRAPS) {
   configure._sample_threads.set_is_set(_dcmd_sample_threads.is_set());
   configure._sample_threads.set_value(_dcmd_sample_threads.value());
 
-<<<<<<< HEAD
   configure._sample_object_allocations.set_is_set(_dcmd_sampleobjectallocations.is_set());
   configure._sample_object_allocations.set_value(_dcmd_sampleobjectallocations.value());
 
   configure._object_allocations_sampling_interval.set_is_set(_dcmd_objectallocationssamplinginterval.is_set());
   configure._object_allocations_sampling_interval.set_value(_dcmd_objectallocationssamplinginterval.value());
 
-=======
->>>>>>> jdk-11.0.22+7
   configure.set_verbose(false);
   configure.execute(DCmd_Source_Internal, THREAD);
 
diff --git a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java
index ba36a273d87..30e097997b4 100644
--- a/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java
+++ b/src/jdk.jfr/share/classes/jdk/jfr/internal/dcmd/DCmdConfigure.java
@@ -63,10 +63,7 @@ final class DCmdConfigure extends AbstractDCmd {
     public String execute
     (
             boolean verbose,
-<<<<<<< HEAD
             Boolean onVMStart,
-=======
->>>>>>> jdk-11.0.22+7
             String repositoryPath,
             String dumpPath,
             Integer stackDepth,
@@ -120,15 +117,9 @@ final class DCmdConfigure extends AbstractDCmd {
         if (dumpPath != null)  {
             Options.setDumpPath(new SafePath(dumpPath));
             Logger.log(LogTag.JFR, LogLevel.INFO, "Emergency dump path set to " + dumpPath);
-<<<<<<< HEAD
             if (verbose) {
                 printDumpPath();
             }
-=======
-           if (verbose) {
-               printDumpPath();
-           }
->>>>>>> jdk-11.0.22+7
             updated = true;
         }
 
@@ -218,11 +209,6 @@ final class DCmdConfigure extends AbstractDCmd {
             return "";
         }
 
-=======
-        if (!verbose) {
-            return "";
-        }
->>>>>>> jdk-11.0.22+7
         if (!updated) {
             println("Current configuration:");
             println();
diff --git a/test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java b/test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java
index 538ad147ee5..1d1a79040f3 100644
--- a/test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java
+++ b/test/jdk/jdk/jfr/startupargs/TestOptionsWithLocale.java
@@ -28,21 +28,13 @@ public static void main(String... args) {
         }
     }
 
-<<<<<<< HEAD
-    public static void main(String... args) throws Exception {
-        OutputAnalyzer output = ProcessTools.executeTestJvm(
-=======
     public static void main(String... args) throws IOException {
         ProcessBuilder pb = ProcessTools.createTestJvm(
->>>>>>> jdk-11.0.22+7
                 "-Duser.country=DE",
                 "-Duser.language=de",
                 "-XX:FlightRecorderOptions:stackdepth=128",
                 PrintDate.class.getName());
-<<<<<<< HEAD
-=======
         OutputAnalyzer output = new OutputAnalyzer(pb.start());
->>>>>>> jdk-11.0.22+7
         output.shouldContain("01.01.2020, 00:00:00");
     }
 }