add from dev1
add from dev2
fix confilict