Fetched changes from the origin into the branch\n\nCommited the conflict fix

23 jobs for jhayek/SphShellMesh in 113 minutes and 27 seconds (queued for 2 seconds)
latest