merge and conflict fixes

9 jobs for pointwise_ng in 19 minutes and 59 seconds (queued for 2 seconds)
latest