merge and conflict fixes

9 jobs for pointwise_ng in 19 minutes and 59 seconds (queued for 2 seconds)
latest
Status Job ID Name Coverage
  Build Docker
passed #1057031
build_docker_from_cache

00:00:17

 
  Test
passed #1057032
test_serial

00:14:24

86.0%
 
  Demo Runs
passed #1057038
run_bernoulli

00:00:38

passed #1057039
run_curve_fitting

00:00:38

passed #1057034
run_getting_started_1

00:00:39

passed #1057035
run_getting_started_2

00:01:04

passed #1057036
run_getting_started_3

00:01:48

passed #1057037
run_getting_started_mf

00:05:16

passed #1057033
run_ipynb

00:01:37