add adb conflict