fix conflicts

8 jobs for GONRG-4647-add-pipeline-AF-scheduler in 12 minutes (queued for 2 seconds)