add dev.py
add second feature
add common
add common
merge with --no-ff
modify dev3.py
confilt resolve