hopefully fixing merge conflicts

2 jobs for issue64 in 5 minutes and 16 seconds (queued for 1 second)