create branch quick and simple
create branch quick & simple
conflict fixed
aaa
merge from dev
add dev message