diff --git a/include/constants/battle_move_effects.h b/include/constants/battle_move_effects.h
index 9e514702d8..2c874f4f81 100644
--- a/include/constants/battle_move_effects.h
+++ b/include/constants/battle_move_effects.h
@@ -411,6 +411,5 @@
 #define EFFECT_AXE_KICK                     405
 
 #define NUM_BATTLE_MOVE_EFFECTS             406
->>>>>>> afdfe1503dcb8720cede18b69ed5216e770399e6
 
 #endif  // GUARD_CONSTANTS_BATTLE_MOVE_EFFECTS_H