commit to resolve
resolving conflict