Trying to resolve all the merge conflicts.

toolboxes/DebyeFit/optimization.py

@@ -474,7 +474,6 @@ def DLS(logt, rl, im, freq):
     rp, ip = np.matmul(d.real, x[np.newaxis].T).T[0], np.matmul(d.imag, x[np.newaxis].T).T[0]
     cost_i = np.sum(np.abs(ip - im)) / len(im)
     ee = np.mean(rl - rp)
-    if ee < 1:
-        ee = 1
+    ee = max(ee, 1)
     cost_r = np.sum(np.abs(rp + ee - rl)) / len(im)
     return cost_i, cost_r, x, ee, rp, ip