Fix device conflict scenario