committing changes 2
resolving conflicts