add test/dev1 pwd
fixed conflict