fix conflicts

4 jobs for python3 in 6 minutes and 54 seconds (queued for 3 seconds)