committing b2
commitng modification
committing conflicts