diff --git a/docs/reference/run.md b/docs/reference/run.md
index 91262aa5e..2cfb88b1e 100644
--- a/docs/reference/run.md
+++ b/docs/reference/run.md
@@ -1142,7 +1142,6 @@ volume mounted on the host).
 
 ### USER
 
-<<<<<<< HEAD
 `root` (id = 0) is the default user within a container. The image developer can
 create additional users. Those users are accessible by name.  When passing a numeric
 ID, the user does not have to exist in the container.
@@ -1150,18 +1149,10 @@ ID, the user does not have to exist in the container.
 The developer can set a default user to run the first process with the
 Dockerfile `USER` instruction. When starting a container, the operator can override
 the `USER` instruction by passing the `-u` option.
-=======
-The default user within a container is `root` (id = 0), but if the developer
-created additional users, those are accessible by name.  When passing a numeric
-ID, the user doesn't have to exist in the container.
-
-The developer can set a default user to run the first process with the
-Dockerfile `USER` instruction, but the operator can override it:
->>>>>>> 4d89910... reference/run: Add a paragraph break
 
     -u="": Username or UID
 
-> **Note:** if you pass a numeric uid, it must be in the range 0-2147483647.
+> **Note:** if you pass a numeric uid, it must be in the range of 0-2147483647.
 
 ### WORKDIR