second branch created
conflict resolved