fix merge conflict

4 jobs for testing in 2 minutes and 49 seconds (queued for 3 seconds)
latest