commit after resolving conflict