adb_server_port added, resolved conflicts
merged