diff --git a/docs/docs/api/gesture-handlers/pan-gh.md b/docs/docs/api/gesture-handlers/pan-gh.md
index 5167e1fa95..a9bf7bde3d 100644
--- a/docs/docs/api/gesture-handlers/pan-gh.md
+++ b/docs/docs/api/gesture-handlers/pan-gh.md
@@ -6,13 +6,9 @@ sidebar_label: Pan
 
 A continuous gesture handler that can recognize a panning (dragging) gesture and track its movement.
 
-<<<<<<< HEAD:docs/docs/handler-pan.md
-The handler [activates](state.md#active) when a finger is placed on the screen and moved some initial distance.
-=======
 The handler [activates](../../state.md#active) when a finger is placed on the screen and moved some initial distance.
 
-> > > > > > > origin/master:docs/docs/api/gesture-handlers/pan-gh.md
-> > > > > > > Configurations such as a minimum initial distance, specific vertical or horizontal pan detection and [number of fingers](#minPointers) required for activation (allowing for multifinger swipes) may be specified.
+Configurations such as a minimum initial distance, specific vertical or horizontal pan detection and [number of fingers](#minPointers) required for activation (allowing for multifinger swipes) may be specified.
 
 Gesture callback can be used for continuous tracking of the pan gesture. It provides information about the gesture such as its XY translation from the starting point as well as its instantaneous velocity.