branch first commit
branch commit
merge conflict resolve