solve merge conflicts

1 job for develop-Regimes
in 5 minutes and 52 seconds, using 0 compute credits, and was queued for 2 seconds