diff --git a/.github/workflows/code.yml b/.github/workflows/code.yml
index 87bf5dedd..04c796a39 100644
--- a/.github/workflows/code.yml
+++ b/.github/workflows/code.yml
@@ -33,7 +33,6 @@ jobs:
   
       - name: Run ruff
         uses: davidslusser/actions_python_ruff@v1.0.1
-
         with:
           python_version: "3.11"
 
diff --git a/CHANGES.rst b/CHANGES.rst
index 08313ce06..f12a7205f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -28,20 +28,12 @@ describe future plans.
 1.6.19
 ******
 
-<<<<<<< HEAD
-<<<<<<< HEAD
 release expected by 2024-04-12
 
 New Features
 ------------
 
 * Add new plan for edge alignment called edge_align
-=======
-release expected by 2024-04-02
->>>>>>> 562df2bb (DOC #909 update release notes)
-=======
-release expected by 2024-04-12
->>>>>>> 63c1db08 (DOC #955)
 
 New Features
 ------------
@@ -54,21 +46,15 @@ Fixes
 * lineup2() should work with low intensity peaks.
 * lineup2() would raise ZeroDivideError in some cases.
 * Increase minimum aps-dm-api version to 8.
-<<<<<<< HEAD
 * Race condition with SR570 pre-amp.
-=======
->>>>>>> 2e612356 (DOC #932 update relase notes)
 
 Maintenance
 -----------
 
 * Code format conforms to 'ruff'.
 * Add additional support for APS Data Management API.
-<<<<<<< HEAD
 * Make the home page more concise.
 * Refactor packaging from setup.py to pyproject.toml.
-=======
->>>>>>> 2e612356 (DOC #932 update relase notes)
 
 1.6.18
 ******
diff --git a/apstools/plans/alignment.py b/apstools/plans/alignment.py
index 6e2bd8238..a3f78b22c 100644
--- a/apstools/plans/alignment.py
+++ b/apstools/plans/alignment.py
@@ -37,14 +37,8 @@
 
 def lineup(
     # fmt: off
-    detectors,
-    axis,
-    minus,
-    plus,
-    npts,
-    time_s=0.1,
-    peak_factor=4,
-    width_factor=0.8,
+    detectors, axis, minus, plus, npts,
+    time_s=0.1, peak_factor=4, width_factor=0.8,
     feature="cen",
     rescan=True,
     bec=None,
diff --git a/pyproject.toml b/pyproject.toml
index 708fbf617..6d629bbb8 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -67,7 +67,7 @@ dependencies = [
   "pyepics>=3.4.2",
   "pyRestTable>=2020.0.8",
   "pysumreg",
-  "scipy>=1.13.0",
+  "scipy",
   "spec2nexus>=2021.1.7",
   "xlrd",
 ]
diff --git a/requirements.txt b/requirements.txt
index f33302ee6..867acfd22 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,6 +13,6 @@ psutil
 pyepics>=3.4.2
 pyRestTable
 pysumreg
-scipy>=1.13.0
+scipy
 spec2nexus>=2021.1.7
 xlrd