merge and conflict fixes

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

00:00:17

 
  Test
passed test_serial #1057032

00:14:24

86.0%
 
  Demo Runs
passed run_bernoulli #1057038

00:00:38

passed run_curve_fitting #1057039

00:00:38

passed run_getting_started_1 #1057034

00:00:39

passed run_getting_started_2 #1057035

00:01:04

passed run_getting_started_3 #1057036

00:01:48

passed run_getting_started_mf #1057037

00:05:16

passed run_ipynb #1057033

00:01:37