diff --git a/doc/src/Build_package.rst b/doc/src/Build_package.rst
index cc02b9b5e6..32b72c544a 100644
--- a/doc/src/Build_package.rst
+++ b/doc/src/Build_package.rst
@@ -136,10 +136,7 @@ src directory.
 .. _cmake_presets:
 
 CMake presets for installing many packages
-<<<<<<< HEAD
-=======
 """"""""""""""""""""""""""""""""""""""""""
->>>>>>> upstream/master
 
 Instead of specifying all the CMake options via the command-line,
 CMake allows initializing its settings cache using script files.
diff --git a/doc/src/Commands_fix.rst b/doc/src/Commands_fix.rst
index 6387f616f0..9a3c5df9cd 100644
--- a/doc/src/Commands_fix.rst
+++ b/doc/src/Commands_fix.rst
@@ -150,10 +150,7 @@ OPT.
    * :doc:`orient/bcc <fix_orient>`
    * :doc:`orient/fcc <fix_orient>`
    * :doc:`orient/eco <fix_orient_eco>`
-<<<<<<< HEAD
    * :doc:`pafi <fix_pafi>`
-=======
->>>>>>> upstream/master
    * :doc:`phonon <fix_phonon>`
    * :doc:`pimd <fix_pimd>`
    * :doc:`planeforce <fix_planeforce>`
diff --git a/doc/src/compute_property_atom.rst b/doc/src/compute_property_atom.rst
index 672a38e852..ec9322bb7b 100644
--- a/doc/src/compute_property_atom.rst
+++ b/doc/src/compute_property_atom.rst
@@ -189,11 +189,8 @@ Related commands
 :doc:`dump custom <dump>`, :doc:`compute reduce <compute_reduce>`,
 :doc::doc:`fix ave/atom <fix_ave_atom>`, :doc:`fix ave/chunk
 :doc:<fix_ave_chunk>`, `fix property/atom <fix_property_atom>`
-<<<<<<< HEAD
-=======
 
 Default
 """""""
->>>>>>> upstream/master
 
 none
diff --git a/doc/src/fix.rst b/doc/src/fix.rst
index cafd762801..4d026f462f 100644
--- a/doc/src/fix.rst
+++ b/doc/src/fix.rst
@@ -293,10 +293,7 @@ accelerated styles exist.
 * :doc:`orient/bcc <fix_orient>` - add grain boundary migration force for BCC
 * :doc:`orient/fcc <fix_orient>` - add grain boundary migration force for FCC
 * :doc:`orient/eco <fix_orient_eco>` - add generalized grain boundary migration force
-<<<<<<< HEAD
 * :doc:`pafi <fix_pafi>` - constrained force averages on hyper-planes to compute free energies (PAFI)
-=======
->>>>>>> upstream/master
 * :doc:`phonon <fix_phonon>` - calculate dynamical matrix from MD simulations
 * :doc:`pimd <fix_pimd>` - Feynman path integral molecular dynamics
 * :doc:`planeforce <fix_planeforce>` - constrain atoms to move in a plane
diff --git a/src/USER-MISC/README b/src/USER-MISC/README
index eb5a036afb..cce6adc168 100644
--- a/src/USER-MISC/README
+++ b/src/USER-MISC/README
@@ -63,10 +63,7 @@ fix momentum/chunk, Jiang Xiao (Hong Kong Polytechnic University), polyu-xiao.ji
 fix npt/cauchy, R. E. Miller (Carleton University), F. Pavia and S. Pattamatta, 12 Jan 2020
 fix nvk, Efrem Braun (UC Berkeley), efrem.braun at gmail.com, https://github.com/lammps/lammps/pull/310
 fix orient/eco Adrian A. Schratt and Volker Mohles (Ruhr-Uni Bochum), volker.mohles at rub.de, 6 Jun 2020
-<<<<<<< HEAD
 fix pafi, Thomas Swinburne (CNRS), swinburne at cinam.univ-mrs.fr, 1st May 2020
-=======
->>>>>>> upstream/master
 fix pimd, Yuxing Peng (U Chicago), yuxing at uchicago.edu, 24 Nov 2014
 fix propel/self, Stefan Paquay (Brandeis U), stefanpaquay at gmail.com, 20 Jan 2020
 fix rhok, Ulf Pedersen (Roskilde U), ulf at urp.dk, 25 Sep 2017