commit after resolving conflicts