diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
index 901c893b54f..0fd2104f9d6 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.cpp
@@ -1240,11 +1240,11 @@ void LIR_Assembler::type_profile_helper(Register mdo,
                                         Register recv) {
   int mdp_offset = md->byte_offset_of_slot(data, in_ByteSize(0));
   if (ProfileCaptureRatio > 1) {
-    __ profile_receiver_type
-      (recv, mdo, mdp_offset, &increment_mdo);
+    __ profile_receiver_type(recv, mdo, mdp_offset, &increment_mdo);
   } else {
     __ profile_receiver_type(recv, mdo, mdp_offset);
   }
+}
 
 void LIR_Assembler::emit_typecheck_helper(LIR_OpTypeCheck *op, Label* success, Label* failure, Label* obj_is_null) {
   // we always need a stub for the failure case.
diff --git a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
index 84a67ac30f6..b042513efb0 100644
--- a/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/c1_LIRAssembler_aarch64.hpp
@@ -50,14 +50,8 @@ friend class ArrayCopyStub;
   Address stack_slot_address(int index, uint shift, Register tmp, int adjust = 0);
 
   // Record the type of the receiver in ReceiverTypeData
-<<<<<<< HEAD
-  void type_profile_helper(Register mdo,
-                           ciMethodData *md, ciProfileData *data,
-                           Register recv);
-=======
   void type_profile_helper(Register mdo, ciMethodData *md,
                            ciProfileData *data, Register recv);
->>>>>>> master
   void add_debug_info_for_branch(address adr, CodeEmitInfo* info);
   void casw(Register addr, Register newval, Register cmpval);
   void casl(Register addr, Register newval, Register cmpval);
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
index 17f3da26088..e25fa86be9e 100644
--- a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
+++ b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -1147,7 +1147,6 @@ public:
   typedef void (*addptr_32_insn_t)(MacroAssembler *masm, Address dst, int32_t src);
   void profile_receiver_type(Register recv, Register mdp, int mdp_offset,
                              addptr_32_insn_t inc = &addptr_32);
-  void profile_receiver_type(Register recv, Register mdp, int mdp_offset);
 
   void verify_sve_vector_length(Register tmp = rscratch1);
   void reinitialize_ptrue() {