resolve rebase conflicts

27 jobs for coverage in 33 minutes and 27 seconds (queued for 2 seconds)