Add adb
Fix merge conflict.