Commit for resolving conflicts