under branch dev
local branch dev
by developer1
by developer2
fix conflict (developer1)