feat: merge and fix conflicts

4 jobs for slb/mm/api-seismic-processing-project in 5 minutes and 33 seconds (queued for 2 seconds)