commit dev
quick and simple
quick & simple
conflict
 modify
merge no ff