create dev
create dev
modify dev 1st
modify dev local 1st
merge with dev
other 2
local 2
merge
merge