diff --git a/data/magic.mse-game/keywords b/data/magic.mse-game/keywords
index c25a6dac..46a89442 100644
--- a/data/magic.mse-game/keywords
+++ b/data/magic.mse-game/keywords
@@ -151,11 +151,7 @@ keyword:
 	keyword: Banding
 	match: Banding
 	mode: old
-<<<<<<< .mine
 	reminder: Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding you control are blocking or being blocked by a creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking.
-=======
-	reminder: Any creatures with banding, and up to one without, can attack in a band. Bands are blocked as a group. If any creatures with banding you control are blocking or being blocked by a creature, you divide that creature's combat damage, not its controller, among any of the creatures it's being blocked by or is blocking
->>>>>>> .r1399
 keyword:
 	keyword: Landwalk
 	match: <atom-param>prefix</atom-param>walk