fix conflict docs

Author: northernSage

docs/features.rst

@@ -174,12 +174,10 @@ example, in your project’s ``pytest.ini`` file)::
             assert b'got it' in res.read()
 
 
-<<<<<<< HEAD
 ``--live-server-wait`` - the live server wait timeout (5 seconds)
 `````````````````````````````````````````````````````````````````
 
 The timeout after which test case is aborted if live server is not started.
-=======
 ``--live-server-port`` - use a fixed port
 `````````````````````````````````````````
 
@@ -189,7 +187,6 @@ in your project's ``pytest.ini`` file)::
 
     [pytest]
     addopts = --live-server-port=5000
->>>>>>> f01e17da79d512ad7c0a410be4693f0652b73df1
 
 
 ``request_ctx`` - request context