Merge conflict in test_filter_scheduler_qos.py