cfq-iosched: fix merge error