fix

Author: ammgws

Misc/NEWS.d/next/Windows/2021-10-29-15-02-46.bpo-30082.VhSkKB.rst

@@ -1,7 +1,3 @@
 Adds new ``force_hide`` argument to :mod:`subprocess` functions.
 This passes ``SW_HIDE`` to the new process, which most applications
-<<<<<<< HEAD
 will use to not display any window even if they normally would.
-=======
-will use to not display any window even if they normally would.
->>>>>>> 6edd817705a (chore: add newline to fix lint error)