first commit on test branch
test branch moving fwd
conflict resolvedf