diff --git a/data/pokemon/base_stats/belledam.asm b/data/pokemon/base_stats/belledam.asm
index 46f85c5..883e30e 100644
--- a/data/pokemon/base_stats/belledam.asm
+++ b/data/pokemon/base_stats/belledam.asm
@@ -14,12 +14,7 @@
 	INCBIN "gfx/pokemon/belledam/front.dimensions"
 	dw NULL, NULL ; unused (beta front/back pics)
 	db GROWTH_MEDIUM_FAST ; growth rate
-<<<<<<< HEAD
 	dn EGG_GROUND, EGG_GROUND ; egg groups
-=======
-	dn EGG_FIELD, EGG_FIELD ; egg groups
->>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da
-
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, CUT, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/farigiraf.asm b/data/pokemon/base_stats/farigiraf.asm
index 725aa88..b4e42a2 100644
--- a/data/pokemon/base_stats/farigiraf.asm
+++ b/data/pokemon/base_stats/farigiraf.asm
@@ -17,9 +17,5 @@
 	dn EGG_GROUND, EGG_INDETERMINATE ; egg groups
 
 	; tm/hm learnset
-<<<<<<< HEAD
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT
-=======
-	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DREAM_EATER, REST, ATTRACT, THIEF, NIGHTMARE, STRENGTH, THUNDERBOLT
->>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da
 	; end
diff --git a/data/pokemon/base_stats/moibelle.asm b/data/pokemon/base_stats/moibelle.asm
index dca8ec0..eeba1c7 100644
--- a/data/pokemon/base_stats/moibelle.asm
+++ b/data/pokemon/base_stats/moibelle.asm
@@ -14,12 +14,7 @@
 	INCBIN "gfx/pokemon/moibelle/front.dimensions"
 	dw NULL, NULL ; unused (beta front/back pics)
 	db GROWTH_MEDIUM_FAST ; growth rate
-<<<<<<< HEAD
 	dn EGG_GROUND, EGG_GROUND ; egg groups
-=======
-	dn EGG_FIELD, EGG_FIELD ; egg groups
->>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da
-
 	; tm/hm learnset
 	tmhm HEADBUTT, CURSE, TOXIC, ZAP_CANNON, PSYCH_UP, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, NIGHTMARE, CUT, FLASH, THUNDERBOLT
 	; end
diff --git a/data/pokemon/base_stats/phandarin.asm b/data/pokemon/base_stats/phandarin.asm
index e92ca43..3826895 100644
--- a/data/pokemon/base_stats/phandarin.asm
+++ b/data/pokemon/base_stats/phandarin.asm
@@ -17,9 +17,5 @@
 	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
 	; tm/hm learnset
-<<<<<<< HEAD
 	tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT
-=======
-	tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, HYPER_BEAM PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, THUNDER, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDER_PUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH. THUNDERBOLT
->>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da
 	; end
diff --git a/data/pokemon/base_stats/stromen.asm b/data/pokemon/base_stats/stromen.asm
index d2cfb40..72f0e77 100644
--- a/data/pokemon/base_stats/stromen.asm
+++ b/data/pokemon/base_stats/stromen.asm
@@ -17,9 +17,5 @@
 	dn EGG_INDETERMINATE, EGG_INDETERMINATE ; egg groups
 
 	; tm/hm learnset
-<<<<<<< HEAD
 	tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDERPUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, THUNDERBOLT
-=======
-	tmhm DYNAMICPUNCH, HEADBUTT, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, GIGA_DRAIN, ENDURE, FRUSTRATION, THUNDER, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SLUDGE_BOMB, SWIFT, THUNDER_PUNCH, DREAM_EATER, DETECT, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH. THUNDERBOLT
->>>>>>> 2a6935c344e316fbd63afd3238dcef0d20f2c7da
 	; end