diff --git a/combat.tex b/combat.tex
index 5ce4310ed11aff1e2558d6754eed2d794a11a4ef..d123910fa04bb97365676b264e50efa483e7da8b 100644
--- a/combat.tex
+++ b/combat.tex
@@ -338,13 +338,8 @@ Long bows can be fired for hundreds of yards -- the maximum range is generally m
 
 A short bow, or `trick bow', is a smaller, lighter thing which can be used by anyone.
 What it lacks in punch it makes up for in quick draw time.
-<<<<<<< HEAD
 As usual, for every five steps beyond the first two the archer suffers a -1 penalty to hit.
-The bow takes 2 \gls{ap} points to fire, so many shots can be fired in a \gls{round}.
-=======
-As usual, for every five squares beyond the first two the archer suffers a -1 penalty to hit.
 The short bow takes 1 \gls{ap} points to fire, and 1 \gls{ap} points to reload, so many shots can be fired in a \gls{round}.
->>>>>>> dev
 
 Shortbows have a maximum range of 20 steps and deal $1D6-1$ Damage.
 They often bring down prey by multiple arrows rather than the one.
@@ -686,13 +681,8 @@ The attacker spends 3 \glspl{ap} points to rush forward.
 The defender can either spend 3 \glspl{ap} and attempt to resist, or can simply acquiesce with a normal movement action, spending 1 \gls{ap}.
 
 Resisting means engaging in a Strength + Combat roll.
-<<<<<<< HEAD
 When moving back, targets are pushed back 2 steps; the attacker's Strength adds to this and the opponent's Strength decreases it.
-Strong characters might also can sacrifice the use of 1 point of Strength to push back an additional person.
-=======
-When moving back, targets are pushed back 2 squares; the attacker's Strength adds to this and the opponent's Strength decreases it.
 Strong characters might also sacrifice the use of 1 point of Strength to push back an additional person.
->>>>>>> dev
 
 Characters who have been rammed must be able to move far back enough as part of their normal movement action, otherwise they fall \textit{Prone}.