描述Resolve merge conflicts non-interactively, validate build and tests, and finalize conflict resolution