add some dev1
fixed confict branch dev