made changes
conflict
conflicting
merged branches
branch1commit
branch 2 changes
branch3
updating
cleaning up conflicts