Commit after resolving conflicts