add device
fix conflict