fix merge conflicts

.github/workflows/cron-staging.yml

@@ -43,9 +43,6 @@ jobs:
         run: tox -e terra-main
         if: runner.os == 'macOS'
         env:
-<<<<<<< HEAD
-          OMP_NUM_THREADS: 1
-=======
           TEST_TIMEOUT: 120
           OMP_NUM_THREADS: 1
   docs:
@@ -79,4 +76,3 @@ jobs:
         with:
           name: html_docs
           path: artifacts
->>>>>>> f16be3b (Update docstring options parser and add docs cron job (#1312))

docs/tutorials/calibrations.rst

@@ -455,13 +455,8 @@ error which we want to correct.
 
     from qiskit_experiments.library import FineSXAmplitudeCal
 
-<<<<<<< HEAD
-    amp_cal = FineSXAmplitudeCal([qubit], cals, backend=backend, schedule_name="sx")
-    amp_cal.circuits()[4].draw(output="mpl")
-=======
     amp_cal = FineSXAmplitudeCal((qubit,), cals, backend=backend, schedule_name="sx")
     amp_cal.circuits()[4].draw(output="mpl", style="iqp")
->>>>>>> f16be3b (Update docstring options parser and add docs cron job (#1312))
 
 Let's run the calibration experiment:
 

tox.ini

@@ -75,12 +75,6 @@ setenv =
 commands =
   sphinx-build -T -W --keep-going -b html {posargs} docs/ docs/_build/html
 
-<<<<<<< HEAD
-[pycodestyle]
-max-line-length = 100
-
-
-=======
 [testenv:docs-terra-main]
 usedevelop = True
 passenv =
@@ -100,4 +94,3 @@ skip_install = true
 deps =
 allowlist_externals = rm
 commands = rm -rf {toxinidir}/docs/stubs/ {toxinidir}/docs/_build
->>>>>>> f16be3b (Update docstring options parser and add docs cron job (#1312))