Merge branch 'id-allow-conflicts-on-merge' into 'master'

Add option to include conflict markers to merge commit

See merge request gitlab-org/gitaly!2626

9 files changed, 236 insertions, 145 deletions

diff --git a/changelogs/unreleased/id-allow-conflicts-on-merge.yml b/changelogs/unreleased/id-allow-conflicts-on-merge.yml
new file mode 100644
index 000000000..22d6c7582
--- /dev/null
+++ b/changelogs/unreleased/id-allow-conflicts-on-merge.yml
@@ -0,0 +1,5 @@
+---
+title: Add option to include conflict markers to merge commit
+merge_request: 2626
+author:
+type: added
diff --git a/internal/gitaly/service/operations/merge.go b/internal/gitaly/service/operations/merge.go
index 466cbf5e0..f5ab8a346 100644
--- a/internal/gitaly/service/operations/merge.go
+++ b/internal/gitaly/service/operations/merge.go
@@ -444,7 +444,7 @@ func (s *server) UserMergeToRef(ctx context.Context, in *gitalypb.UserMergeToRef
 		return nil, helper.ErrInvalidArgument(err)
 	}
 
-	if featureflag.IsEnabled(ctx, featureflag.GoUserMergeBranch) {
+	if featureflag.IsEnabled(ctx, featureflag.GoUserMergeBranch) && !in.AllowConflicts {
 		return s.userMergeToRef(ctx, in)
 	}
 
diff --git a/internal/gitaly/service/operations/merge_test.go b/internal/gitaly/service/operations/merge_test.go
index feeb9a408..8e0cb3faa 100644
--- a/internal/gitaly/service/operations/merge_test.go
+++ b/internal/gitaly/service/operations/merge_test.go
@@ -1,6 +1,7 @@
 package operations
 
 import (
+	"bytes"
 	"context"
 	"fmt"
 	"io/ioutil"
@@ -617,6 +618,57 @@ func testSuccessfulUserMergeToRefRequest(t *testing.T, ctx context.Context) {
 	}
 }
 
+func TestConflictsOnUserMergeToRefRequest(t *testing.T) {
+	testWithFeature(t, featureflag.GoUserMergeToRef, testConflictsOnUserMergeToRefRequest)
+}
+
+func testConflictsOnUserMergeToRefRequest(t *testing.T, ctx context.Context) {
+	serverSocketPath, stop := runOperationServiceServer(t)
+	defer stop()
+
+	client, conn := newOperationClient(t, serverSocketPath)
+	defer conn.Close()
+
+	testRepo, testRepoPath, cleanupFn := testhelper.NewTestRepo(t)
+	defer cleanupFn()
+
+	prepareMergeBranchWithHead(t, testRepoPath, "824be604a34828eb682305f0d963056cfac87b2d")
+
+	request := &gitalypb.UserMergeToRefRequest{
+		Repository:     testRepo,
+		User:           testhelper.TestUser,
+		TargetRef:      []byte("refs/merge-requests/x/written"),
+		SourceSha:      "1450cd639e0bc6721eb02800169e464f212cde06",
+		Message:        []byte("message1"),
+		FirstParentRef: []byte("refs/heads/" + mergeBranchName),
+	}
+
+	t.Run("allow conflicts to be merged with markers", func(t *testing.T) {
+		request.AllowConflicts = true
+
+		resp, err := client.UserMergeToRef(ctx, request)
+		require.NoError(t, err)
+
+		var buf bytes.Buffer
+		cmd := exec.Command(command.GitPath(), "-C", testRepoPath, "show", resp.CommitId)
+		cmd.Stdout = &buf
+		require.NoError(t, cmd.Run())
+
+		bufStr := buf.String()
+		require.Contains(t, bufStr, "+<<<<<<< files/ruby/popen.rb")
+		require.Contains(t, bufStr, "+>>>>>>> files/ruby/popen.rb")
+		require.Contains(t, bufStr, "+<<<<<<< files/ruby/regex.rb")
+		require.Contains(t, bufStr, "+>>>>>>> files/ruby/regex.rb")
+	})
+
+	t.Run("disallow conflicts to be merged", func(t *testing.T) {
+		request.AllowConflicts = false
+
+		_, err := client.UserMergeToRef(ctx, request)
+		require.Error(t, err)
+	})
+}
+
 func TestFailedUserMergeToRefRequest(t *testing.T) {
 	testWithFeature(t, featureflag.GoUserMergeToRef, testFailedUserMergeToRefRequest)
 }
@@ -764,8 +816,12 @@ func testUserMergeToRefIgnoreHooksRequest(t *testing.T, ctx context.Context) {
 }
 
 func prepareMergeBranch(t *testing.T, testRepoPath string) {
+	prepareMergeBranchWithHead(t, testRepoPath, mergeBranchHeadBefore)
+}
+
+func prepareMergeBranchWithHead(t *testing.T, testRepoPath, mergeBranchHead string) {
 	deleteBranch(testRepoPath, mergeBranchName)
-	out, err := exec.Command(command.GitPath(), "-C", testRepoPath, "branch", mergeBranchName, mergeBranchHeadBefore).CombinedOutput()
+	out, err := exec.Command(command.GitPath(), "-C", testRepoPath, "branch", mergeBranchName, mergeBranchHead).CombinedOutput()
 	require.NoError(t, err, "set up branch to merge into: %s", out)
 }
 
diff --git a/proto/go/gitalypb/operations.pb.go b/proto/go/gitalypb/operations.pb.go
index d71383d22..0a0f73fd9 100644
--- a/proto/go/gitalypb/operations.pb.go
+++ b/proto/go/gitalypb/operations.pb.go
@@ -803,10 +803,13 @@ type UserMergeToRefRequest struct {
 	User       *User       `protobuf:"bytes,2,opt,name=user,proto3" json:"user,omitempty"`
 	SourceSha  string      `protobuf:"bytes,3,opt,name=source_sha,json=sourceSha,proto3" json:"source_sha,omitempty"`
 	// branch is deprecated in favor of `first_parent_ref`.
-	Branch               []byte   `protobuf:"bytes,4,opt,name=branch,proto3" json:"branch,omitempty"`
-	TargetRef            []byte   `protobuf:"bytes,5,opt,name=target_ref,json=targetRef,proto3" json:"target_ref,omitempty"`
-	Message              []byte   `protobuf:"bytes,6,opt,name=message,proto3" json:"message,omitempty"`
-	FirstParentRef       []byte   `protobuf:"bytes,7,opt,name=first_parent_ref,json=firstParentRef,proto3" json:"first_parent_ref,omitempty"`
+	Branch         []byte `protobuf:"bytes,4,opt,name=branch,proto3" json:"branch,omitempty"`
+	TargetRef      []byte `protobuf:"bytes,5,opt,name=target_ref,json=targetRef,proto3" json:"target_ref,omitempty"`
+	Message        []byte `protobuf:"bytes,6,opt,name=message,proto3" json:"message,omitempty"`
+	FirstParentRef []byte `protobuf:"bytes,7,opt,name=first_parent_ref,json=firstParentRef,proto3" json:"first_parent_ref,omitempty"`
+	// Allow conflicts to occur. Any conflict markers will be part of the merge commit.
+	// Only text conflicts are handled, tree-based conflicts are not supported.
+	AllowConflicts       bool     `protobuf:"varint,8,opt,name=allow_conflicts,json=allowConflicts,proto3" json:"allow_conflicts,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -886,6 +889,13 @@ func (m *UserMergeToRefRequest) GetFirstParentRef() []byte {
 	return nil
 }
 
+func (m *UserMergeToRefRequest) GetAllowConflicts() bool {
+	if m != nil {
+		return m.AllowConflicts
+	}
+	return false
+}
+
 type UserMergeToRefResponse struct {
 	CommitId             string   `protobuf:"bytes,1,opt,name=commit_id,json=commitId,proto3" json:"commit_id,omitempty"`
 	PreReceiveError      string   `protobuf:"bytes,2,opt,name=pre_receive_error,json=preReceiveError,proto3" json:"pre_receive_error,omitempty"`
@@ -2603,141 +2613,142 @@ func init() {
 func init() { proto.RegisterFile("operations.proto", fileDescriptor_1b4a5877375e491e) }
 
 var fileDescriptor_1b4a5877375e491e = []byte{
-	// 2132 bytes of a gzipped FileDescriptorProto
+	// 2152 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0xcd, 0x73, 0x1b, 0x49,
-	0x15, 0xf7, 0x48, 0xb2, 0x2c, 0x3f, 0xcb, 0xb6, 0xdc, 0xf9, 0x58, 0xad, 0x12, 0x63, 0xef, 0x38,
+	0x15, 0xf7, 0x48, 0xb2, 0x2c, 0x3f, 0xcb, 0xb2, 0xdc, 0xf9, 0x58, 0xad, 0x12, 0x63, 0xef, 0x38,
 	0x21, 0x4e, 0x58, 0x94, 0xad, 0xb0, 0x05, 0x5c, 0x16, 0x2a, 0x96, 0x65, 0x9c, 0xb0, 0x8e, 0xcd,
-	0xd8, 0x81, 0x5a, 0x6a, 0x61, 0x6a, 0x2c, 0xb5, 0xa4, 0x29, 0x24, 0xcd, 0x6c, 0xcf, 0xc8, 0xc4,
-	0x1c, 0x38, 0x52, 0xc5, 0x61, 0x8f, 0x7c, 0xdc, 0xa9, 0xe2, 0x40, 0x71, 0x86, 0x1b, 0xc7, 0x2d,
-	0xb8, 0x71, 0xdd, 0x03, 0xfc, 0x01, 0x54, 0x71, 0xe1, 0xe3, 0xc2, 0x89, 0xea, 0x7e, 0x6f, 0xa4,
-	0xe9, 0x99, 0x91, 0xd7, 0x59, 0x1c, 0x27, 0x45, 0xed, 0xcd, 0xf3, 0xfa, 0xe9, 0xf5, 0x7b, 0xbf,
-	0xf7, 0xd1, 0xef, 0x75, 0x1b, 0x2a, 0x9e, 0xcf, 0x85, 0x13, 0xba, 0xde, 0x30, 0xa8, 0xfb, 0xc2,
-	0x0b, 0x3d, 0x56, 0xec, 0xba, 0xa1, 0xd3, 0x3f, 0xad, 0x41, 0xdf, 0x1d, 0x86, 0x48, 0xab, 0x95,
-	0x83, 0x9e, 0x23, 0x78, 0x1b, 0xbf, 0xcc, 0xdf, 0x1b, 0xf0, 0xda, 0xd3, 0x80, 0x8b, 0x86, 0xe0,
-	0x4e, 0xc8, 0xb7, 0x84, 0x33, 0x6c, 0xf5, 0x2c, 0xfe, 0xc1, 0x88, 0x07, 0x21, 0xfb, 0x2a, 0x80,
-	0xe0, 0xbe, 0x17, 0xb8, 0xa1, 0x27, 0x4e, 0xab, 0xc6, 0xba, 0xb1, 0xb9, 0xf0, 0x80, 0xd5, 0x51,
-	0x64, 0xdd, 0x1a, 0xaf, 0x6c, 0x15, 0x7e, 0xf9, 0xd1, 0x9b, 0x86, 0x15, 0xe3, 0x65, 0x6b, 0xb0,
-	0x70, 0xac, 0x44, 0xd9, 0x43, 0x67, 0xc0, 0xab, 0xb9, 0x75, 0x63, 0xb3, 0x6c, 0x01, 0x92, 0x9e,
-	0x38, 0x03, 0xce, 0xd6, 0xa1, 0x30, 0x0a, 0xb8, 0xa8, 0xe6, 0x95, 0xd0, 0x72, 0x24, 0x54, 0x6a,
-	0x62, 0xa9, 0x15, 0x29, 0x22, 0x08, 0x1d, 0x11, 0xda, 0xbe, 0xe7, 0x0e, 0xc3, 0x6a, 0x01, 0x45,
-	0x28, 0xd2, 0x81, 0xa4, 0x98, 0x43, 0xa8, 0xa6, 0x15, 0x0f, 0x7c, 0x6f, 0x18, 0x70, 0xf6, 0x79,
-	0x28, 0xe2, 0x66, 0xa4, 0xf5, 0x52, 0xb4, 0x01, 0xf1, 0xd1, 0x2a, 0xbb, 0x07, 0x2b, 0xbe, 0xe0,
-	0xb6, 0xe0, 0x2d, 0xee, 0x9e, 0x70, 0x9b, 0x0b, 0xe1, 0x09, 0xa5, 0xed, 0xbc, 0xb5, 0xec, 0x0b,
-	0x6e, 0x21, 0xbd, 0x29, 0xc9, 0xe6, 0x47, 0x84, 0xd4, 0x53, 0xbf, 0xfd, 0x6a, 0x21, 0x75, 0x1d,
-	0x8a, 0x43, 0xfe, 0x43, 0xc1, 0x4f, 0x08, 0x24, 0xfa, 0x92, 0x74, 0xaf, 0xdf, 0x96, 0xf4, 0x59,
-	0xa4, 0xe3, 0x97, 0xb9, 0x83, 0xc0, 0xe9, 0x76, 0x10, 0x70, 0x99, 0x80, 0x18, 0xd9, 0x80, 0xfc,
-	0x9c, 0x00, 0xd9, 0xe6, 0x7d, 0xfe, 0x2a, 0x01, 0x12, 0x19, 0xa8, 0xeb, 0xf5, 0x29, 0x0c, 0xfc,
-	0xd0, 0x80, 0xab, 0x13, 0x41, 0x47, 0x4e, 0xf7, 0x7f, 0xb7, 0xee, 0x75, 0x28, 0x85, 0x4e, 0x37,
-	0x6e, 0xda, 0x5c, 0xe8, 0x74, 0xcf, 0x69, 0x57, 0x03, 0xae, 0x25, 0xd4, 0xf9, 0x14, 0x46, 0xfd,
-	0x99, 0x8c, 0xc2, 0xbc, 0x79, 0xe9, 0x46, 0xb1, 0x3b, 0xb0, 0x1c, 0x3a, 0xa2, 0xcb, 0x43, 0x5b,
-	0xf0, 0x13, 0x37, 0x70, 0xbd, 0x21, 0x85, 0xf1, 0x12, 0x92, 0x2d, 0xa2, 0xb2, 0x2a, 0xcc, 0x0d,
-	0x78, 0x10, 0x38, 0x5d, 0x4e, 0xf1, 0x1c, 0x7d, 0x9a, 0x3f, 0x42, 0x5c, 0x62, 0x16, 0x11, 0x2e,
-	0xab, 0x90, 0x0f, 0x9d, 0x2e, 0xd9, 0xb2, 0x10, 0x6d, 0x2e, 0x39, 0x24, 0x5d, 0x26, 0x08, 0x7f,
-	0xe6, 0x06, 0x61, 0xa0, 0xb4, 0x2e, 0x59, 0xf4, 0x95, 0x0d, 0x67, 0x3e, 0x1b, 0xce, 0x8f, 0x0d,
-	0xb8, 0x2e, 0x37, 0xdf, 0xe3, 0xa2, 0x7b, 0x61, 0x39, 0x10, 0xa1, 0x96, 0x9b, 0x8a, 0xda, 0x0d,
-	0x98, 0x6f, 0x79, 0x83, 0x81, 0x1b, 0xda, 0x6e, 0x9b, 0x54, 0x2b, 0x21, 0xe1, 0x51, 0x5b, 0xda,
-	0x45, 0xd5, 0x8f, 0x0a, 0x02, 0x55, 0xbb, 0xa9, 0x08, 0xb2, 0xab, 0x30, 0xeb, 0xf8, 0x7e, 0xff,
-	0xb4, 0x5a, 0x54, 0x40, 0xe0, 0x87, 0xf9, 0x5b, 0x4a, 0x70, 0xcd, 0x36, 0x82, 0x56, 0x53, 0xc0,
-	0x48, 0x28, 0xb0, 0x05, 0x8b, 0x94, 0xc3, 0x23, 0x55, 0x64, 0xc8, 0xfd, 0xab, 0x91, 0x21, 0xfb,
-	0xd1, 0x39, 0x85, 0x42, 0xb1, 0x12, 0x59, 0xe5, 0xe3, 0xd8, 0x57, 0xb6, 0x13, 0x0a, 0x99, 0x4e,
-	0x78, 0x5c, 0x28, 0xe5, 0x2a, 0x79, 0xf3, 0xc3, 0x1c, 0xc6, 0x81, 0x52, 0xf7, 0xc8, 0xb3, 0x78,
-	0xe7, 0x32, 0x3c, 0xb1, 0x0a, 0x10, 0x78, 0x23, 0xd1, 0xe2, 0x76, 0xd0, 0x73, 0xc8, 0x15, 0xf3,
-	0x48, 0x39, 0xec, 0x39, 0x53, 0x7d, 0xb1, 0x0a, 0x30, 0x0e, 0xfb, 0x0e, 0xb9, 0x63, 0x3e, 0x8a,
-	0xf8, 0x4e, 0xdc, 0x55, 0x45, 0xdd, 0x55, 0x9b, 0x50, 0xe9, 0xb8, 0x22, 0x08, 0x6d, 0xdf, 0x11,
-	0x7c, 0x88, 0x3f, 0x9f, 0xc3, 0x84, 0x51, 0xf4, 0x03, 0x45, 0xb6, 0x78, 0xc7, 0x74, 0x62, 0x91,
-	0x49, 0x70, 0x9c, 0xc7, 0x79, 0xcf, 0x73, 0x26, 0xfe, 0x18, 0xae, 0x65, 0xfa, 0xf2, 0xec, 0x1d,
-	0xde, 0x80, 0xb2, 0x84, 0xd8, 0x6e, 0xa9, 0x84, 0x6d, 0x53, 0xf6, 0x2d, 0x48, 0x1a, 0xe6, 0x70,
-	0x9b, 0xdd, 0x86, 0x25, 0x8a, 0xa0, 0x88, 0x29, 0xaf, 0x98, 0x28, 0xae, 0x88, 0xcd, 0xfc, 0xb5,
-	0x01, 0x57, 0xa4, 0x8d, 0x3b, 0x3b, 0xaf, 0x76, 0xea, 0x99, 0x3f, 0xa1, 0xaa, 0x3b, 0x51, 0x94,
-	0x5c, 0x91, 0x4a, 0x15, 0xe3, 0x82, 0x52, 0x65, 0x8a, 0xc7, 0xfe, 0x42, 0x49, 0xd2, 0xe8, 0x71,
-	0x21, 0x4e, 0x0f, 0xdc, 0xd6, 0x0f, 0x2e, 0x03, 0xb3, 0xbb, 0x50, 0x44, 0x88, 0xa8, 0x12, 0xac,
-	0x44, 0x3c, 0xdf, 0x70, 0xc3, 0x86, 0x5a, 0xb0, 0x88, 0x21, 0x79, 0xfe, 0x17, 0x52, 0xe7, 0xff,
-	0xf4, 0x2a, 0x76, 0x0f, 0x56, 0xb0, 0x65, 0x8c, 0x0b, 0xc0, 0xf4, 0x59, 0x56, 0x0b, 0x5b, 0x13,
-	0x29, 0xef, 0x40, 0x05, 0x79, 0x63, 0x36, 0xcf, 0x4d, 0xb3, 0x99, 0x7e, 0x3e, 0x21, 0xb0, 0xd7,
-	0x60, 0xae, 0x2d, 0x4e, 0x6d, 0x31, 0x1a, 0x56, 0x4b, 0x78, 0x76, 0xb4, 0xc5, 0xa9, 0x35, 0x1a,
-	0x9a, 0xff, 0xc8, 0x61, 0xd6, 0xc5, 0xf1, 0xbd, 0x58, 0x57, 0x63, 0x42, 0xd8, 0xa1, 0xe0, 0x09,
-	0x57, 0xe3, 0xc2, 0x91, 0xe0, 0xe8, 0x6a, 0x99, 0x66, 0x14, 0xa8, 0xf1, 0x13, 0x6c, 0x01, 0x69,
-	0xc8, 0xf2, 0x1c, 0x45, 0x96, 0xb5, 0xe0, 0x7a, 0x6a, 0x6b, 0xbb, 0xe5, 0xb5, 0xd1, 0x0d, 0x4b,
-	0x0f, 0xea, 0x71, 0xbf, 0xa7, 0xcd, 0xaf, 0x37, 0x74, 0xf5, 0xac, 0x2b, 0x09, 0x7d, 0x1b, 0x5e,
-	0x9b, 0x9b, 0x6f, 0xc3, 0x72, 0x82, 0x8f, 0x95, 0xa0, 0xf0, 0x64, 0xff, 0x49, 0xb3, 0x32, 0xc3,
-	0xe6, 0x61, 0xb6, 0xb9, 0x77, 0x70, 0xf4, 0x5e, 0xc5, 0x60, 0x65, 0x28, 0x35, 0xf6, 0x9f, 0xec,
-	0xbc, 0xfb, 0xa8, 0x71, 0x54, 0xc9, 0x99, 0x1f, 0xe7, 0x60, 0x45, 0x45, 0x1b, 0x3f, 0xe1, 0xd2,
-	0x4d, 0x9f, 0x05, 0xf4, 0xc5, 0x05, 0xf4, 0xdf, 0x72, 0xc0, 0xe2, 0xd8, 0xfe, 0x7f, 0x04, 0xb3,
-	0xfd, 0x09, 0xc1, 0x7c, 0x4f, 0xf3, 0xb9, 0x66, 0xfa, 0x8b, 0x0c, 0xe4, 0x7f, 0xe7, 0xe0, 0x86,
-	0x4a, 0x1f, 0x65, 0xd6, 0x8e, 0xdb, 0xe7, 0xc1, 0xc3, 0x96, 0x44, 0x71, 0x97, 0x3b, 0x6d, 0x2e,
-	0xd8, 0x0e, 0x14, 0x1d, 0xf5, 0xad, 0xe0, 0x4e, 0xe6, 0x5c, 0xf6, 0x8f, 0xea, 0xf8, 0x71, 0x74,
-	0xea, 0x73, 0x8b, 0x7e, 0x2d, 0xcf, 0xb0, 0x8e, 0xdb, 0xe7, 0xb6, 0xef, 0x84, 0x3d, 0x6a, 0xd9,
-	0x4b, 0x92, 0x70, 0xe0, 0x84, 0x3d, 0xb6, 0x01, 0x8b, 0xbe, 0xec, 0xc5, 0xbd, 0x51, 0x80, 0x0c,
-	0x79, 0xc5, 0x50, 0x8e, 0x88, 0x8a, 0x49, 0x1e, 0xd0, 0x4e, 0xc0, 0xbf, 0xfc, 0xb6, 0xdd, 0xf2,
-	0x86, 0x21, 0xa7, 0x09, 0x5d, 0x1e, 0xd0, 0x8a, 0xda, 0x40, 0x22, 0xbb, 0x0b, 0x15, 0xfe, 0x8c,
-	0xb7, 0x46, 0x21, 0xb7, 0xa5, 0xfc, 0x41, 0x84, 0x70, 0xc9, 0x5a, 0x26, 0xfa, 0x0e, 0x91, 0xe5,
-	0xb6, 0xee, 0xb0, 0xc3, 0xc5, 0x58, 0x20, 0xf6, 0xa2, 0x65, 0x45, 0x24, 0x79, 0xe6, 0x53, 0x80,
-	0x89, 0x39, 0x0c, 0xa0, 0xd8, 0xb0, 0x9a, 0x0f, 0x8f, 0x24, 0xa6, 0x4b, 0x00, 0xf8, 0xb7, 0xbd,
-	0xfd, 0xc8, 0xaa, 0x18, 0x72, 0xed, 0xe9, 0xc1, 0xb6, 0x5c, 0xcb, 0x49, 0xe4, 0xf7, 0xf6, 0xbf,
-	0xdd, 0xac, 0xe4, 0x25, 0x75, 0xbb, 0xf9, 0x6e, 0xf3, 0xa8, 0x59, 0x29, 0x48, 0x2f, 0x34, 0x76,
-	0xf7, 0xf6, 0xb7, 0x2b, 0xb3, 0x72, 0x94, 0xbd, 0x96, 0x09, 0x21, 0x7b, 0x07, 0x8a, 0x3d, 0x05,
-	0x23, 0x05, 0xf8, 0xc6, 0x39, 0x10, 0xdf, 0x9d, 0xb1, 0xe8, 0x47, 0xac, 0x06, 0x73, 0x91, 0x39,
-	0x0a, 0xe6, 0xdd, 0x19, 0x2b, 0x22, 0x6c, 0x99, 0xb0, 0x2e, 0x6b, 0x89, 0x4d, 0x71, 0x2d, 0xf1,
-	0x09, 0x6c, 0x74, 0x90, 0xed, 0x3b, 0xa7, 0x7d, 0xcf, 0x69, 0x9b, 0x7f, 0xc8, 0xc3, 0xcd, 0xc4,
-	0x4e, 0x54, 0xde, 0x28, 0x22, 0x5e, 0x64, 0x91, 0x4b, 0x54, 0xae, 0x7c, 0xaa, 0x72, 0xdd, 0x86,
-	0x25, 0x52, 0x3e, 0x2a, 0x60, 0x58, 0xdd, 0x16, 0x91, 0xba, 0x47, 0x65, 0xec, 0x4d, 0x60, 0xc4,
-	0xe6, 0x8c, 0xc2, 0x9e, 0x27, 0x50, 0x1c, 0xd6, 0xba, 0x0a, 0xae, 0x3c, 0x54, 0x0b, 0x4a, 0x68,
-	0x1d, 0xae, 0xe8, 0xdc, 0x7c, 0xe0, 0xb8, 0x7d, 0x2a, 0x7b, 0x2b, 0x71, 0xf6, 0xa6, 0x5c, 0xc8,
-	0x2e, 0x92, 0x73, 0xe7, 0x2f, 0x92, 0xa5, 0xf3, 0x17, 0xc9, 0xab, 0x30, 0xdb, 0xf1, 0x44, 0x8b,
-	0x57, 0xe7, 0x71, 0x4c, 0x52, 0x1f, 0x32, 0x99, 0x50, 0xa8, 0x1c, 0x00, 0x00, 0x1b, 0x42, 0x45,
-	0x38, 0xec, 0x39, 0xe6, 0xef, 0x68, 0x3e, 0x4c, 0x3b, 0x90, 0x7d, 0x2d, 0x11, 0x5a, 0xb7, 0xa6,
-	0x84, 0x96, 0xe6, 0xf0, 0x58, 0x6c, 0x7d, 0x65, 0x5c, 0x0c, 0x72, 0x7a, 0xed, 0xcd, 0x0e, 0xcd,
-	0x99, 0x28, 0xfb, 0xb7, 0x36, 0xe0, 0x8d, 0x74, 0xe0, 0x09, 0xdc, 0x65, 0x1c, 0x79, 0xbf, 0x89,
-	0x2e, 0x06, 0xe3, 0x8a, 0x5c, 0x60, 0xf1, 0x5f, 0x83, 0x05, 0x77, 0xd8, 0xe6, 0xcf, 0xb4, 0xb2,
-	0x0f, 0x8a, 0x74, 0x46, 0x39, 0x9f, 0x32, 0x85, 0xff, 0x93, 0xd2, 0xc4, 0xe2, 0xb2, 0xfc, 0x34,
-	0xbc, 0x61, 0xc7, 0x15, 0x03, 0xe7, 0xb8, 0xcf, 0x23, 0xac, 0x9b, 0x09, 0xac, 0xbf, 0xa0, 0xd7,
-	0xf7, 0xec, 0x5f, 0xd5, 0x53, 0x90, 0x5f, 0x8f, 0xe6, 0x64, 0x35, 0xb2, 0xec, 0xce, 0xd0, 0xa4,
-	0x5c, 0xfb, 0x63, 0x0e, 0x8a, 0x97, 0x90, 0x90, 0x37, 0x60, 0x5e, 0x28, 0x5d, 0x63, 0xa3, 0x07,
-	0x12, 0xce, 0x98, 0xfa, 0x57, 0x81, 0x52, 0x56, 0xc5, 0xe7, 0x2c, 0x0e, 0xa8, 0x48, 0x91, 0x03,
-	0xea, 0xd7, 0x61, 0x45, 0xf0, 0x81, 0x17, 0xf2, 0x78, 0x4e, 0x14, 0xa7, 0xe6, 0x44, 0x05, 0x99,
-	0x63, 0x49, 0xb1, 0x01, 0x8b, 0x24, 0x80, 0xb6, 0xc7, 0xdc, 0x2b, 0x23, 0x11, 0x23, 0x40, 0x4e,
-	0xad, 0x5d, 0x37, 0xb4, 0xfd, 0x51, 0xd0, 0xb3, 0x3d, 0x5f, 0x5d, 0x51, 0x57, 0x4b, 0xeb, 0xf9,
-	0xcd, 0x79, 0x6b, 0xa9, 0xeb, 0x86, 0x07, 0xa3, 0xa0, 0xb7, 0x8f, 0xd4, 0xad, 0xbb, 0x70, 0x47,
-	0x05, 0x27, 0x19, 0xda, 0x9a, 0x78, 0x25, 0x15, 0xa2, 0x7f, 0x35, 0x60, 0x75, 0x8a, 0xff, 0x28,
-	0x50, 0xd7, 0xa4, 0x33, 0x94, 0x1c, 0x69, 0xbb, 0x9a, 0x43, 0x77, 0x67, 0x2c, 0x02, 0x51, 0x5a,
-	0x7f, 0x07, 0x96, 0x88, 0x41, 0x3a, 0xd2, 0x8d, 0x86, 0xd1, 0xdd, 0x19, 0x6b, 0x11, 0xe9, 0x0f,
-	0x91, 0xfc, 0x3c, 0xd1, 0x28, 0xdd, 0xd4, 0x1d, 0x37, 0x2a, 0xd8, 0x80, 0x94, 0xba, 0xd4, 0xa5,
-	0x6c, 0xdd, 0x83, 0xcd, 0xe9, 0xf6, 0xa1, 0xda, 0x63, 0x03, 0x7f, 0x46, 0x7d, 0xed, 0xe1, 0x07,
-	0x23, 0x27, 0xb8, 0xac, 0xe1, 0x36, 0x50, 0x9b, 0xc5, 0x22, 0x0c, 0x09, 0x8f, 0xda, 0x7a, 0xa1,
-	0x9b, 0xd5, 0x0b, 0x9d, 0x6c, 0x20, 0xf9, 0xb0, 0xad, 0x96, 0x8a, 0x6a, 0xa9, 0xc8, 0x87, 0x6d,
-	0xb9, 0x70, 0x0b, 0x8a, 0x58, 0xc8, 0xa9, 0x1d, 0xd5, 0xb7, 0xa5, 0xb5, 0x8c, 0xa3, 0xa4, 0x94,
-	0x71, 0x94, 0x3c, 0x2e, 0x94, 0x0a, 0x95, 0x59, 0xd3, 0xc5, 0x96, 0x34, 0x82, 0x65, 0x7c, 0xdb,
-	0x07, 0xa4, 0xfb, 0xd8, 0xd9, 0x16, 0x59, 0x23, 0xf5, 0xd0, 0xbc, 0x92, 0xd7, 0xbd, 0x82, 0x37,
-	0x48, 0x56, 0xda, 0xc5, 0xe6, 0xaf, 0x68, 0x5e, 0x96, 0x71, 0x70, 0x7a, 0xe0, 0x84, 0x93, 0x3b,
-	0x86, 0x33, 0xcb, 0x77, 0x8a, 0xbd, 0x9e, 0xd5, 0x1a, 0xf8, 0x92, 0x81, 0x07, 0x93, 0xd6, 0x80,
-	0x08, 0xb5, 0x9f, 0x1a, 0x97, 0x52, 0x4f, 0x36, 0x60, 0x91, 0x2e, 0xa1, 0x28, 0x75, 0xa9, 0xd3,
-	0x43, 0x22, 0xa6, 0xee, 0xb8, 0x4d, 0x51, 0x95, 0xce, 0x56, 0x1a, 0xa6, 0x32, 0xf1, 0x7d, 0x3c,
-	0xe4, 0xe2, 0x56, 0x5f, 0xdc, 0x51, 0x61, 0xfe, 0xcb, 0x80, 0xda, 0xe4, 0xc5, 0xe2, 0x70, 0x74,
-	0x3c, 0xf0, 0xda, 0xa3, 0x49, 0x6d, 0x7f, 0xc1, 0xb7, 0x7b, 0x14, 0x96, 0xb1, 0xdb, 0x3d, 0xa4,
-	0x9c, 0x75, 0xbb, 0x77, 0x13, 0xe6, 0x83, 0x48, 0xcd, 0xe8, 0x72, 0x6f, 0x4c, 0xc8, 0x88, 0xf5,
-	0x62, 0x46, 0xac, 0x9b, 0x7f, 0x32, 0x70, 0x18, 0x48, 0x99, 0xfd, 0x72, 0xae, 0x8e, 0x52, 0x23,
-	0x58, 0x21, 0x35, 0x82, 0x3d, 0x2e, 0x94, 0xf2, 0x95, 0x82, 0x95, 0x9e, 0xea, 0x1e, 0xfc, 0x1d,
-	0xa0, 0x32, 0xd6, 0xe7, 0x90, 0x8b, 0x13, 0xb7, 0xc5, 0xd9, 0xf7, 0xa0, 0x92, 0x7c, 0xc1, 0x63,
-	0x6b, 0x5a, 0x13, 0x93, 0x7e, 0x94, 0xac, 0xad, 0x4f, 0x67, 0x40, 0x5c, 0xcc, 0xe2, 0x7f, 0x7e,
-	0xb1, 0x99, 0x2b, 0x19, 0x91, 0xf8, 0xf8, 0x3b, 0x97, 0x2e, 0x3e, 0xe3, 0x25, 0x4f, 0x17, 0x9f,
-	0xf5, 0x44, 0x96, 0x14, 0x1f, 0x7f, 0x65, 0xd2, 0xc5, 0x67, 0xbc, 0x8b, 0xe9, 0xe2, 0xb3, 0x1e,
-	0xa8, 0xc6, 0xe2, 0x8f, 0x60, 0x51, 0x7b, 0xd4, 0x60, 0x37, 0xd3, 0x86, 0x4f, 0x5e, 0x6f, 0x6a,
-	0xab, 0x53, 0x56, 0xb3, 0xa5, 0x8e, 0x9f, 0x90, 0x74, 0xa9, 0xc9, 0x87, 0x2e, 0x5d, 0x6a, 0xea,
-	0xdd, 0x69, 0x2c, 0xf5, 0x3b, 0xb0, 0xa4, 0xdf, 0x34, 0x33, 0xed, 0x87, 0xa9, 0x0b, 0xf9, 0xda,
-	0xe7, 0xa6, 0x2d, 0x27, 0x04, 0x7f, 0x1f, 0x96, 0x13, 0x0f, 0x10, 0x2c, 0xfd, 0x53, 0x1d, 0xe1,
-	0xb5, 0xa9, 0xeb, 0xba, 0xec, 0x4d, 0xe3, 0x2d, 0x83, 0x7d, 0x0b, 0xca, 0xf1, 0x5b, 0x59, 0x76,
-	0x23, 0xfe, 0xe3, 0xc4, 0xa5, 0x72, 0xed, 0x66, 0xf6, 0x62, 0x36, 0x16, 0x93, 0x0b, 0x30, 0x1d,
-	0x8b, 0xd4, 0xbd, 0xab, 0x8e, 0x45, 0xfa, 0xde, 0x6c, 0x2c, 0xf8, 0x7d, 0xc4, 0x22, 0xd6, 0x8f,
-	0xeb, 0x58, 0xa4, 0x27, 0x06, 0x1d, 0x8b, 0x8c, 0x46, 0x7e, 0x82, 0x05, 0xf3, 0xf1, 0x98, 0x4b,
-	0xb5, 0x52, 0xec, 0xd6, 0x79, 0x3a, 0xe5, 0xda, 0xed, 0x4f, 0xe0, 0xca, 0xc0, 0xfe, 0x9b, 0x00,
-	0x93, 0xcb, 0x15, 0xf6, 0x7a, 0xd6, 0x85, 0x0b, 0xca, 0xae, 0x4d, 0xbf, 0x8b, 0x19, 0x83, 0x43,
-	0xc2, 0xb0, 0x23, 0xd0, 0x85, 0x69, 0xcd, 0x93, 0x2e, 0x4c, 0x6f, 0x20, 0xc6, 0xc2, 0xde, 0x43,
-	0x17, 0x4e, 0x4e, 0x33, 0xdd, 0x85, 0xa9, 0xb3, 0x5d, 0x77, 0x61, 0xfa, 0x10, 0x8c, 0xc1, 0xdc,
-	0xc1, 0xf7, 0x8a, 0x44, 0x49, 0x67, 0x66, 0xba, 0xea, 0x24, 0x8f, 0xb9, 0xda, 0xc6, 0x99, 0x3c,
-	0xfa, 0x4e, 0x5b, 0x6f, 0x7d, 0x57, 0x72, 0xf7, 0x9d, 0xe3, 0x7a, 0xcb, 0x1b, 0xdc, 0xc7, 0x3f,
-	0xbf, 0xe8, 0x89, 0xee, 0x7d, 0x94, 0x71, 0x5f, 0xfd, 0xf3, 0xc7, 0xfd, 0xae, 0x47, 0xdf, 0xfe,
-	0xf1, 0x71, 0x51, 0x91, 0xbe, 0xf4, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xeb, 0x39, 0xc9, 0x90,
-	0x45, 0x22, 0x00, 0x00,
+	0xd8, 0x81, 0x5a, 0x6a, 0x61, 0x6a, 0x2c, 0xb5, 0xa5, 0x29, 0x24, 0xcd, 0x6c, 0xcf, 0xc8, 0x1b,
+	0x73, 0xe0, 0x48, 0x15, 0x07, 0x8e, 0x7c, 0xdc, 0xa9, 0xe2, 0x40, 0x71, 0x5e, 0x6e, 0x1c, 0xb7,
+	0xe0, 0xc6, 0x75, 0x0f, 0xf0, 0x07, 0x50, 0xc5, 0x85, 0x8f, 0x0b, 0x27, 0xaa, 0xfb, 0xbd, 0x91,
+	0xa6, 0x67, 0x46, 0x5e, 0x67, 0x71, 0x9c, 0x14, 0xc5, 0xcd, 0xf3, 0xfa, 0xe9, 0xf5, 0x7b, 0xbf,
+	0xf7, 0xd1, 0xef, 0x75, 0x1b, 0xaa, 0x9e, 0xcf, 0x85, 0x13, 0xba, 0xde, 0x30, 0x68, 0xf8, 0xc2,
+	0x0b, 0x3d, 0x56, 0xec, 0xba, 0xa1, 0xd3, 0x3f, 0xad, 0x43, 0xdf, 0x1d, 0x86, 0x48, 0xab, 0x97,
+	0x83, 0x9e, 0x23, 0x78, 0x07, 0xbf, 0xcc, 0xdf, 0x19, 0xf0, 0xda, 0xd3, 0x80, 0x8b, 0xa6, 0xe0,
+	0x4e, 0xc8, 0x37, 0x85, 0x33, 0x6c, 0xf7, 0x2c, 0xfe, 0xc1, 0x88, 0x07, 0x21, 0xfb, 0x2a, 0x80,
+	0xe0, 0xbe, 0x17, 0xb8, 0xa1, 0x27, 0x4e, 0x6b, 0xc6, 0x9a, 0xb1, 0xb1, 0xf0, 0x80, 0x35, 0x50,
+	0x64, 0xc3, 0x1a, 0xaf, 0x6c, 0x16, 0x7e, 0xf9, 0xf1, 0x9b, 0x86, 0x15, 0xe3, 0x65, 0xab, 0xb0,
+	0x70, 0xa4, 0x44, 0xd9, 0x43, 0x67, 0xc0, 0x6b, 0xb9, 0x35, 0x63, 0xa3, 0x6c, 0x01, 0x92, 0x9e,
+	0x38, 0x03, 0xce, 0xd6, 0xa0, 0x30, 0x0a, 0xb8, 0xa8, 0xe5, 0x95, 0xd0, 0x72, 0x24, 0x54, 0x6a,
+	0x62, 0xa9, 0x15, 0x29, 0x22, 0x08, 0x1d, 0x11, 0xda, 0xbe, 0xe7, 0x0e, 0xc3, 0x5a, 0x01, 0x45,
+	0x28, 0xd2, 0xbe, 0xa4, 0x98, 0x43, 0xa8, 0xa5, 0x15, 0x0f, 0x7c, 0x6f, 0x18, 0x70, 0xf6, 0x79,
+	0x28, 0xe2, 0x66, 0xa4, 0x75, 0x25, 0xda, 0x80, 0xf8, 0x68, 0x95, 0xdd, 0x83, 0x65, 0x5f, 0x70,
+	0x5b, 0xf0, 0x36, 0x77, 0x4f, 0xb8, 0xcd, 0x85, 0xf0, 0x84, 0xd2, 0x76, 0xde, 0x5a, 0xf2, 0x05,
+	0xb7, 0x90, 0xde, 0x92, 0x64, 0xf3, 0x63, 0x42, 0xea, 0xa9, 0xdf, 0x79, 0xb5, 0x90, 0xba, 0x0e,
+	0xc5, 0x21, 0xff, 0x50, 0xf0, 0x13, 0x02, 0x89, 0xbe, 0x24, 0xdd, 0xeb, 0x77, 0x24, 0x7d, 0x16,
+	0xe9, 0xf8, 0x65, 0x6e, 0x23, 0x70, 0xba, 0x1d, 0x04, 0x5c, 0x26, 0x20, 0x46, 0x36, 0x20, 0x3f,
+	0x27, 0x40, 0xb6, 0x78, 0x9f, 0xbf, 0x4a, 0x80, 0x44, 0x06, 0xea, 0x7a, 0x7d, 0x06, 0x03, 0x7f,
+	0x6a, 0xc0, 0xd5, 0x89, 0xa0, 0x43, 0xa7, 0xfb, 0xdf, 0x5b, 0xf7, 0x3a, 0x94, 0x42, 0xa7, 0x1b,
+	0x37, 0x6d, 0x2e, 0x74, 0xba, 0xe7, 0xb4, 0xab, 0x09, 0xd7, 0x12, 0xea, 0x7c, 0x06, 0xa3, 0xfe,
+	0x44, 0x46, 0x61, 0xde, 0xbc, 0x74, 0xa3, 0xd8, 0x1d, 0x58, 0x0a, 0x1d, 0xd1, 0xe5, 0xa1, 0x2d,
+	0xf8, 0x89, 0x1b, 0xb8, 0xde, 0x90, 0xc2, 0xb8, 0x82, 0x64, 0x8b, 0xa8, 0xac, 0x06, 0x73, 0x03,
+	0x1e, 0x04, 0x4e, 0x97, 0x53, 0x3c, 0x47, 0x9f, 0xe6, 0x0f, 0x11, 0x97, 0x98, 0x45, 0x84, 0xcb,
+	0x0a, 0xe4, 0x43, 0xa7, 0x4b, 0xb6, 0x2c, 0x44, 0x9b, 0x4b, 0x0e, 0x49, 0x97, 0x09, 0xc2, 0x9f,
+	0xb9, 0x41, 0x18, 0x28, 0xad, 0x4b, 0x16, 0x7d, 0x65, 0xc3, 0x99, 0xcf, 0x86, 0xf3, 0x13, 0x03,
+	0xae, 0xcb, 0xcd, 0x77, 0xb9, 0xe8, 0x5e, 0x58, 0x0e, 0x44, 0xa8, 0xe5, 0xa6, 0xa2, 0x76, 0x03,
+	0xe6, 0xdb, 0xde, 0x60, 0xe0, 0x86, 0xb6, 0xdb, 0x21, 0xd5, 0x4a, 0x48, 0x78, 0xd4, 0x91, 0x76,
+	0x51, 0xf5, 0xa3, 0x82, 0x40, 0xd5, 0x6e, 0x2a, 0x82, 0xec, 0x2a, 0xcc, 0x3a, 0xbe, 0xdf, 0x3f,
+	0xad, 0x15, 0x15, 0x10, 0xf8, 0x61, 0xfe, 0x96, 0x12, 0x5c, 0xb3, 0x8d, 0xa0, 0xd5, 0x14, 0x30,
+	0x12, 0x0a, 0x6c, 0xc2, 0x22, 0xe5, 0xf0, 0x48, 0x15, 0x19, 0x72, 0xff, 0x4a, 0x64, 0xc8, 0x5e,
+	0x74, 0x4e, 0xa1, 0x50, 0xac, 0x44, 0x56, 0xf9, 0x28, 0xf6, 0x95, 0xed, 0x84, 0x42, 0xa6, 0x13,
+	0x1e, 0x17, 0x4a, 0xb9, 0x6a, 0xde, 0xfc, 0x28, 0x87, 0x71, 0xa0, 0xd4, 0x3d, 0xf4, 0x2c, 0x7e,
+	0x7c, 0x19, 0x9e, 0x58, 0x01, 0x08, 0xbc, 0x91, 0x68, 0x73, 0x3b, 0xe8, 0x39, 0xe4, 0x8a, 0x79,
+	0xa4, 0x1c, 0xf4, 0x9c, 0xa9, 0xbe, 0x58, 0x01, 0x18, 0x87, 0xfd, 0x31, 0xb9, 0x63, 0x3e, 0x8a,
+	0xf8, 0xe3, 0xb8, 0xab, 0x8a, 0xba, 0xab, 0x36, 0xa0, 0x7a, 0xec, 0x8a, 0x20, 0xb4, 0x7d, 0x47,
+	0xf0, 0x21, 0xfe, 0x7c, 0x0e, 0x13, 0x46, 0xd1, 0xf7, 0x15, 0x59, 0xca, 0xb8, 0x03, 0x4b, 0x4e,
+	0xbf, 0xef, 0x7d, 0x68, 0xb7, 0xbd, 0xe1, 0x71, 0xdf, 0x6d, 0x87, 0x41, 0xad, 0xa4, 0xdc, 0x5b,
+	0x51, 0xe4, 0x66, 0x44, 0x35, 0x9d, 0x58, 0x08, 0x13, 0x6e, 0xe7, 0xf1, 0xf2, 0xf3, 0x1c, 0x9e,
+	0x3f, 0x82, 0x6b, 0x99, 0x4e, 0x3f, 0x7b, 0x87, 0x37, 0xa0, 0x2c, 0x7d, 0x61, 0xb7, 0x55, 0x66,
+	0x77, 0x28, 0x4d, 0x17, 0x24, 0x0d, 0x93, 0xbd, 0xc3, 0x6e, 0x43, 0x85, 0x42, 0x2d, 0x62, 0xca,
+	0x2b, 0x26, 0x0a, 0x40, 0x62, 0x33, 0x7f, 0x6d, 0xc0, 0x15, 0x69, 0xe3, 0xf6, 0xf6, 0xab, 0x9d,
+	0xa3, 0xe6, 0x8f, 0xa9, 0x3c, 0x4f, 0x14, 0x25, 0x57, 0xa4, 0x72, 0xca, 0xb8, 0xa0, 0x9c, 0x9a,
+	0xe2, 0xb1, 0x3f, 0x53, 0x36, 0x35, 0x7b, 0x5c, 0x88, 0xd3, 0x7d, 0xb7, 0xfd, 0x83, 0xcb, 0xc0,
+	0xec, 0x2e, 0x14, 0x11, 0x22, 0x2a, 0x19, 0xcb, 0x11, 0xcf, 0x37, 0xdc, 0xb0, 0xa9, 0x16, 0x2c,
+	0x62, 0x48, 0x36, 0x0a, 0x85, 0x54, 0xa3, 0x30, 0xbd, 0xdc, 0xdd, 0x83, 0x65, 0xec, 0x2d, 0xe3,
+	0x02, 0x30, 0xcf, 0x96, 0xd4, 0xc2, 0xe6, 0x44, 0xca, 0x3b, 0x50, 0x45, 0xde, 0x98, 0xcd, 0x73,
+	0xd3, 0x6c, 0xa6, 0x9f, 0x4f, 0x08, 0xec, 0x35, 0x98, 0xeb, 0x88, 0x53, 0x5b, 0x8c, 0x86, 0x94,
+	0x7c, 0xc5, 0x8e, 0x38, 0xb5, 0x46, 0x43, 0xf3, 0xef, 0x39, 0xcc, 0xba, 0x38, 0xbe, 0x17, 0xeb,
+	0x6a, 0x4c, 0x08, 0x3b, 0x14, 0x3c, 0xe1, 0x6a, 0x5c, 0x38, 0x14, 0x1c, 0x5d, 0x2d, 0xd3, 0x8c,
+	0x02, 0x35, 0x7e, 0xd4, 0x2d, 0x20, 0x0d, 0x59, 0x9e, 0xa3, 0x1a, 0xb3, 0x36, 0x5c, 0x4f, 0x6d,
+	0x6d, 0xb7, 0xbd, 0x0e, 0xba, 0xa1, 0xf2, 0xa0, 0x11, 0xf7, 0x7b, 0xda, 0xfc, 0x46, 0x53, 0x57,
+	0xcf, 0xba, 0x92, 0xd0, 0xb7, 0xe9, 0x75, 0xb8, 0xf9, 0x36, 0x2c, 0x25, 0xf8, 0x58, 0x09, 0x0a,
+	0x4f, 0xf6, 0x9e, 0xb4, 0xaa, 0x33, 0x6c, 0x1e, 0x66, 0x5b, 0xbb, 0xfb, 0x87, 0xef, 0x55, 0x0d,
+	0x56, 0x86, 0x52, 0x73, 0xef, 0xc9, 0xf6, 0xbb, 0x8f, 0x9a, 0x87, 0xd5, 0x9c, 0xf9, 0x49, 0x0e,
+	0x96, 0x55, 0xb4, 0xf1, 0x13, 0x2e, 0xdd, 0xf4, 0xff, 0x80, 0xbe, 0xb8, 0x80, 0xfe, 0x6b, 0x0e,
+	0x58, 0x1c, 0xdb, 0xff, 0x8d, 0x60, 0xb6, 0x3f, 0x25, 0x98, 0xef, 0x69, 0x3e, 0xd7, 0x4c, 0x7f,
+	0x91, 0x81, 0xfc, 0xaf, 0x1c, 0xdc, 0x50, 0xe9, 0xa3, 0xcc, 0xda, 0x76, 0xfb, 0x3c, 0x78, 0xd8,
+	0x96, 0x28, 0xee, 0x70, 0xa7, 0xc3, 0x05, 0xdb, 0x86, 0xa2, 0xa3, 0xbe, 0x15, 0xdc, 0xc9, 0x9c,
+	0xcb, 0xfe, 0x51, 0x03, 0x3f, 0x0e, 0x4f, 0x7d, 0x6e, 0xd1, 0xaf, 0xe5, 0x19, 0x76, 0xec, 0xf6,
+	0xb9, 0xed, 0x3b, 0x61, 0x8f, 0x7a, 0xfb, 0x92, 0x24, 0xec, 0x3b, 0x61, 0x8f, 0xad, 0xc3, 0xa2,
+	0x2f, 0x9b, 0x76, 0x6f, 0x14, 0x20, 0x43, 0x5e, 0x31, 0x94, 0x23, 0xa2, 0x62, 0x92, 0x07, 0xb4,
+	0x13, 0xf0, 0x2f, 0xbf, 0x2d, 0xdb, 0x90, 0x90, 0xd3, 0x28, 0x2f, 0x0f, 0x68, 0x45, 0x6d, 0x22,
+	0x91, 0xdd, 0x85, 0x2a, 0x7f, 0xc6, 0xdb, 0xa3, 0x90, 0xdb, 0x52, 0xfe, 0x20, 0x42, 0xb8, 0x64,
+	0x2d, 0x11, 0x7d, 0x9b, 0xc8, 0x72, 0x5b, 0x77, 0x78, 0xcc, 0xc5, 0x58, 0x20, 0x36, 0xad, 0x65,
+	0x45, 0x24, 0x79, 0xe6, 0x53, 0x80, 0x89, 0x39, 0x0c, 0xa0, 0xd8, 0xb4, 0x5a, 0x0f, 0x0f, 0x25,
+	0xa6, 0x15, 0x00, 0xfc, 0xdb, 0xde, 0x7a, 0x64, 0x55, 0x0d, 0xb9, 0xf6, 0x74, 0x7f, 0x4b, 0xae,
+	0xe5, 0x24, 0xf2, 0xbb, 0x7b, 0xdf, 0x6e, 0x55, 0xf3, 0x92, 0xba, 0xd5, 0x7a, 0xb7, 0x75, 0xd8,
+	0xaa, 0x16, 0xa4, 0x17, 0x9a, 0x3b, 0xbb, 0x7b, 0x5b, 0xd5, 0x59, 0x39, 0xf3, 0x5e, 0xcb, 0x84,
+	0x90, 0xbd, 0x03, 0xc5, 0x9e, 0x82, 0x91, 0x02, 0x7c, 0xfd, 0x1c, 0x88, 0xef, 0xcc, 0x58, 0xf4,
+	0x23, 0x56, 0x87, 0xb9, 0xc8, 0x1c, 0x05, 0xf3, 0xce, 0x8c, 0x15, 0x11, 0x36, 0x4d, 0x58, 0x93,
+	0xb5, 0xc4, 0xa6, 0xb8, 0x96, 0xf8, 0x04, 0x36, 0x3a, 0xc8, 0xf6, 0x9d, 0xd3, 0xbe, 0xe7, 0x74,
+	0xcc, 0xdf, 0xe7, 0xe1, 0x66, 0x62, 0x27, 0x2a, 0x6f, 0x14, 0x11, 0x2f, 0xb2, 0xc8, 0x25, 0x2a,
+	0x57, 0x3e, 0x55, 0xb9, 0x6e, 0x43, 0x85, 0x94, 0x8f, 0x0a, 0x18, 0x56, 0xb7, 0x45, 0xa4, 0xee,
+	0x52, 0x19, 0x7b, 0x13, 0x18, 0xb1, 0x39, 0xa3, 0xb0, 0xe7, 0x09, 0x14, 0x87, 0xb5, 0xae, 0x8a,
+	0x2b, 0x0f, 0xd5, 0x82, 0x12, 0xda, 0x80, 0x2b, 0x3a, 0x37, 0x1f, 0x38, 0x6e, 0x9f, 0xca, 0xde,
+	0x72, 0x9c, 0xbd, 0x25, 0x17, 0xb2, 0x8b, 0xe4, 0xdc, 0xf9, 0x8b, 0x64, 0xe9, 0xfc, 0x45, 0xf2,
+	0x2a, 0xcc, 0x1e, 0x7b, 0xa2, 0xcd, 0x6b, 0xf3, 0x38, 0x4f, 0xa9, 0x0f, 0x99, 0x4c, 0x28, 0x54,
+	0x4e, 0x0a, 0x80, 0x0d, 0xa1, 0x22, 0x1c, 0xf4, 0x1c, 0xf3, 0x23, 0x1a, 0x24, 0xd3, 0x0e, 0x64,
+	0x5f, 0x4b, 0x84, 0xd6, 0xad, 0x29, 0xa1, 0xa5, 0x39, 0x3c, 0x16, 0x5b, 0x5f, 0x19, 0x17, 0x83,
+	0x9c, 0x5e, 0x7b, 0xb3, 0x43, 0x73, 0x26, 0xca, 0xfe, 0xcd, 0x75, 0x78, 0x23, 0x1d, 0x78, 0x02,
+	0x77, 0x19, 0x47, 0xde, 0x6f, 0xa2, 0x1b, 0xc4, 0xb8, 0x22, 0x17, 0x58, 0xfc, 0x57, 0x61, 0xc1,
+	0x1d, 0x76, 0xf8, 0x33, 0xad, 0xec, 0x83, 0x22, 0x9d, 0x51, 0xce, 0xa7, 0x8c, 0xeb, 0xff, 0xa0,
+	0x34, 0xb1, 0xb8, 0x2c, 0x3f, 0x72, 0x04, 0x72, 0xc5, 0xc0, 0x39, 0xea, 0xf3, 0x08, 0xeb, 0x56,
+	0x02, 0xeb, 0x2f, 0xe8, 0xf5, 0x3d, 0xfb, 0x57, 0x8d, 0x14, 0xe4, 0xd7, 0xa3, 0x81, 0x5a, 0x8d,
+	0x2c, 0x3b, 0x33, 0x34, 0x52, 0xd7, 0xff, 0x90, 0x83, 0xe2, 0x25, 0x24, 0xe4, 0x0d, 0x98, 0x17,
+	0x4a, 0xd7, 0xd8, 0xe8, 0x81, 0x84, 0x33, 0xae, 0x07, 0x56, 0x80, 0x52, 0x56, 0xc5, 0xe7, 0x2c,
+	0x4e, 0xb2, 0x48, 0x91, 0x93, 0xec, 0xd7, 0x61, 0x59, 0xf0, 0x81, 0x17, 0xf2, 0x78, 0x4e, 0x14,
+	0xa7, 0xe6, 0x44, 0x15, 0x99, 0x63, 0x49, 0xb1, 0x0e, 0x8b, 0x24, 0x80, 0xb6, 0xc7, 0xdc, 0x2b,
+	0x23, 0x11, 0x23, 0x40, 0x8e, 0xb7, 0x5d, 0x37, 0xb4, 0xfd, 0x51, 0xd0, 0xb3, 0x3d, 0x5f, 0xdd,
+	0x65, 0xd7, 0x4a, 0x6b, 0xf9, 0x8d, 0x79, 0xab, 0xd2, 0x75, 0xc3, 0xfd, 0x51, 0xd0, 0xdb, 0x43,
+	0xea, 0xe6, 0x5d, 0xb8, 0xa3, 0x82, 0x93, 0x0c, 0x6d, 0x4f, 0xbc, 0x92, 0x0a, 0xd1, 0xbf, 0x18,
+	0xb0, 0x32, 0xc5, 0x7f, 0x14, 0xa8, 0xab, 0xd2, 0x19, 0x4a, 0x8e, 0xb4, 0x5d, 0xcd, 0xa1, 0x3b,
+	0x33, 0x16, 0x81, 0x28, 0xad, 0xbf, 0x03, 0x15, 0x62, 0x90, 0x8e, 0x74, 0xa3, 0x61, 0x74, 0x67,
+	0xc6, 0x5a, 0x44, 0xfa, 0x43, 0x24, 0x3f, 0x4f, 0x34, 0x4a, 0x37, 0x75, 0xc7, 0x8d, 0x0a, 0x36,
+	0x20, 0xa5, 0x2e, 0x75, 0x29, 0x9b, 0xf7, 0x60, 0x63, 0xba, 0x7d, 0xa8, 0xf6, 0xd8, 0xc0, 0x9f,
+	0x51, 0x5f, 0x7b, 0xf0, 0xc1, 0xc8, 0x09, 0x2e, 0x6b, 0xb8, 0x0d, 0xd4, 0x66, 0xb1, 0x08, 0x43,
+	0xc2, 0xa3, 0x8e, 0x5e, 0xe8, 0x66, 0xf5, 0x42, 0x27, 0x1b, 0x48, 0x3e, 0xec, 0xa8, 0xa5, 0xa2,
+	0x5a, 0x2a, 0xf2, 0x61, 0x47, 0x2e, 0xdc, 0x82, 0x22, 0x16, 0x72, 0x6a, 0x47, 0xf5, 0x6d, 0x69,
+	0x2d, 0xe3, 0x28, 0x29, 0x65, 0x1c, 0x25, 0x8f, 0x0b, 0xa5, 0x42, 0x75, 0xd6, 0x74, 0xb1, 0x25,
+	0x8d, 0x60, 0x19, 0x5f, 0x0b, 0x02, 0xe9, 0x3e, 0x76, 0xb6, 0x45, 0xd6, 0x48, 0x3d, 0x34, 0xaf,
+	0xe4, 0x75, 0xaf, 0xe0, 0x55, 0x93, 0x95, 0x76, 0xb1, 0xf9, 0x2b, 0x9a, 0x97, 0x65, 0x1c, 0x9c,
+	0xee, 0x3b, 0xe1, 0xe4, 0x8e, 0xe1, 0xcc, 0xf2, 0x9d, 0x62, 0x6f, 0x64, 0xb5, 0x06, 0xbe, 0x64,
+	0xe0, 0xc1, 0xa4, 0x35, 0x20, 0x42, 0xfd, 0x27, 0xc6, 0xa5, 0xd4, 0x93, 0x75, 0x58, 0xa4, 0xdb,
+	0x2a, 0x4a, 0x5d, 0xea, 0xf4, 0x90, 0x88, 0xa9, 0x3b, 0x6e, 0x53, 0x54, 0xa5, 0xb3, 0x95, 0x86,
+	0xa9, 0x4c, 0x7c, 0x1f, 0x0f, 0xb9, 0xb8, 0xd5, 0x17, 0x77, 0x54, 0x98, 0xff, 0x34, 0xa0, 0x3e,
+	0x79, 0xda, 0x38, 0x18, 0x1d, 0x0d, 0xbc, 0xce, 0x68, 0x52, 0xdb, 0x5f, 0xf0, 0x35, 0x20, 0x85,
+	0x65, 0xec, 0x1a, 0x10, 0x29, 0x67, 0x5d, 0x03, 0xde, 0x84, 0xf9, 0x20, 0x52, 0x33, 0xba, 0x05,
+	0x1c, 0x13, 0x32, 0x62, 0xbd, 0x98, 0x11, 0xeb, 0xe6, 0x1f, 0x0d, 0x1c, 0x06, 0x52, 0x66, 0xbf,
+	0x9c, 0xab, 0xa3, 0xd4, 0x08, 0x56, 0x48, 0x8d, 0x60, 0x8f, 0x0b, 0xa5, 0x7c, 0xb5, 0x60, 0xa5,
+	0xa7, 0xba, 0x07, 0x7f, 0x03, 0xa8, 0x8e, 0xf5, 0x39, 0xe0, 0xe2, 0xc4, 0x6d, 0x73, 0xf6, 0x3d,
+	0xa8, 0x26, 0x9f, 0xfa, 0xd8, 0xaa, 0xd6, 0xc4, 0xa4, 0x5f, 0x2f, 0xeb, 0x6b, 0xd3, 0x19, 0x10,
+	0x17, 0xb3, 0xf8, 0xef, 0x5f, 0x6c, 0xe4, 0x4a, 0x46, 0x24, 0x3e, 0xfe, 0x20, 0xa6, 0x8b, 0xcf,
+	0x78, 0xf2, 0xd3, 0xc5, 0x67, 0xbd, 0xa5, 0x25, 0xc5, 0xc7, 0x9f, 0xa3, 0x74, 0xf1, 0x19, 0x0f,
+	0x68, 0xba, 0xf8, 0xac, 0x97, 0xac, 0xb1, 0xf8, 0x43, 0x58, 0xd4, 0x5e, 0x3f, 0xd8, 0xcd, 0xb4,
+	0xe1, 0x93, 0x67, 0x9e, 0xfa, 0xca, 0x94, 0xd5, 0x6c, 0xa9, 0xe3, 0xb7, 0x26, 0x5d, 0x6a, 0xf2,
+	0x45, 0x4c, 0x97, 0x9a, 0x7a, 0xa0, 0x1a, 0x4b, 0xfd, 0x0e, 0x54, 0xf4, 0x9b, 0x66, 0xa6, 0xfd,
+	0x30, 0x75, 0x73, 0x5f, 0xff, 0xdc, 0xb4, 0xe5, 0x84, 0xe0, 0xef, 0xc3, 0x52, 0xe2, 0xa5, 0x82,
+	0xa5, 0x7f, 0xaa, 0x23, 0xbc, 0x3a, 0x75, 0x5d, 0x97, 0xbd, 0x61, 0xbc, 0x65, 0xb0, 0x6f, 0x41,
+	0x39, 0x7e, 0x2b, 0xcb, 0x6e, 0xc4, 0x7f, 0x9c, 0xb8, 0x54, 0xae, 0xdf, 0xcc, 0x5e, 0xcc, 0xc6,
+	0x62, 0x72, 0x01, 0xa6, 0x63, 0x91, 0xba, 0x77, 0xd5, 0xb1, 0x48, 0xdf, 0x9b, 0x8d, 0x05, 0xbf,
+	0x8f, 0x58, 0xc4, 0xfa, 0x71, 0x1d, 0x8b, 0xf4, 0xc4, 0xa0, 0x63, 0x91, 0xd1, 0xc8, 0x4f, 0xb0,
+	0x60, 0x3e, 0x1e, 0x73, 0xa9, 0x56, 0x8a, 0xdd, 0x3a, 0x4f, 0xa7, 0x5c, 0xbf, 0xfd, 0x29, 0x5c,
+	0x19, 0xd8, 0x7f, 0x13, 0x60, 0x72, 0xb9, 0xc2, 0x5e, 0xcf, 0xba, 0x70, 0x41, 0xd9, 0xf5, 0xe9,
+	0x77, 0x31, 0x63, 0x70, 0x48, 0x18, 0x76, 0x04, 0xba, 0x30, 0xad, 0x79, 0xd2, 0x85, 0xe9, 0x0d,
+	0xc4, 0x58, 0xd8, 0x7b, 0xe8, 0xc2, 0xc9, 0x69, 0xa6, 0xbb, 0x30, 0x75, 0xb6, 0xeb, 0x2e, 0x4c,
+	0x1f, 0x82, 0x31, 0x98, 0x8f, 0xf1, 0xbd, 0x22, 0x51, 0xd2, 0x99, 0x99, 0xae, 0x3a, 0xc9, 0x63,
+	0xae, 0xbe, 0x7e, 0x26, 0x8f, 0xbe, 0xd3, 0xe6, 0x5b, 0xdf, 0x95, 0xdc, 0x7d, 0xe7, 0xa8, 0xd1,
+	0xf6, 0x06, 0xf7, 0xf1, 0xcf, 0x2f, 0x7a, 0xa2, 0x7b, 0x1f, 0x65, 0xdc, 0x57, 0xff, 0x25, 0x72,
+	0xbf, 0xeb, 0xd1, 0xb7, 0x7f, 0x74, 0x54, 0x54, 0xa4, 0x2f, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff,
+	0x57, 0x6d, 0x22, 0x50, 0x6e, 0x22, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/proto/operations.proto b/proto/operations.proto
index 30305d289..d2a2680d6 100644
--- a/proto/operations.proto
+++ b/proto/operations.proto
@@ -183,6 +183,9 @@ message UserMergeToRefRequest {
   bytes target_ref = 5;
   bytes message = 6;
   bytes first_parent_ref = 7;
+  // Allow conflicts to occur. Any conflict markers will be part of the merge commit.
+  // Only text conflicts are handled, tree-based conflicts are not supported.
+  bool allow_conflicts = 8;
 }
 
 message UserMergeToRefResponse {
diff --git a/ruby/.rubocop_todo.yml b/ruby/.rubocop_todo.yml
index 6f5ed7953..87453d9e6 100644
--- a/ruby/.rubocop_todo.yml
+++ b/ruby/.rubocop_todo.yml
@@ -91,7 +91,7 @@ Metrics/BlockLength:
 # Offense count: 8
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 687
+  Max: 699
 
 # Offense count: 7
 # Configuration parameters: IgnoredMethods.
diff --git a/ruby/lib/gitaly_server/operations_service.rb b/ruby/lib/gitaly_server/operations_service.rb
index f85ba5c9c..dd03ac74f 100644
--- a/ruby/lib/gitaly_server/operations_service.rb
+++ b/ruby/lib/gitaly_server/operations_service.rb
@@ -104,7 +104,7 @@ module GitalyServer
       repo = Gitlab::Git::Repository.from_gitaly(request.repository, call)
       user = Gitlab::Git::User.from_gitaly(request.user)
 
-      commit_id = repo.merge_to_ref(user, request.source_sha, request.branch, request.target_ref, request.message.dup, request.first_parent_ref)
+      commit_id = repo.merge_to_ref(user, request.source_sha, request.branch, request.target_ref, request.message.dup, request.first_parent_ref, request.allow_conflicts)
 
       Gitaly::UserMergeToRefResponse.new(commit_id: commit_id)
     rescue Gitlab::Git::CommitError => e
diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb
index e34683e12..2dc164f5f 100644
--- a/ruby/lib/gitlab/git/repository.rb
+++ b/ruby/lib/gitlab/git/repository.rb
@@ -277,7 +277,7 @@ module Gitlab
         tags.find { |tag| tag.name.b == name_b }
       end
 
-      def merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref)
+      def merge_to_ref(user, source_sha, branch, target_ref, message, first_parent_ref, allow_conflicts = false)
         ref = if first_parent_ref.present?
                 find_ref(first_parent_ref)
               else
@@ -290,7 +290,7 @@ module Gitlab
           our_commit = ref.target
           their_commit = source_sha
 
-          create_merge_commit(user, our_commit, their_commit, message)
+          create_merge_commit(user, our_commit, their_commit, message, allow_conflicts)
         end
       rescue Rugged::ReferenceError, InvalidRef
         raise ArgumentError, 'Invalid merge source'
@@ -745,14 +745,16 @@ module Gitlab
         run_git!(%w[config core.sparseCheckout false], include_stderr: true)
       end
 
-      def create_merge_commit(user, our_commit, their_commit, message)
+      def create_merge_commit(user, our_commit, their_commit, message, allow_conflicts = false)
         raise 'Invalid merge target' unless our_commit
         raise 'Invalid merge source' unless their_commit
 
         committer = user_to_committer(user)
 
         merge_index = rugged.merge_commits(our_commit, their_commit)
-        return if merge_index.conflicts?
+        process_conflicts(rugged, merge_index, allow_conflicts)
+
+        return if merge_index.conflicts? # some conflicts are still unresolved
 
         options = {
           parents: [our_commit, their_commit],
@@ -765,6 +767,19 @@ module Gitlab
         create_commit(options)
       end
 
+      def process_conflicts(rugged, merge_index, allow_conflicts)
+        return unless allow_conflicts
+
+        merge_index.conflicts.each do |conflict|
+          path = conflict[:ancestor][:path]
+          file = merge_index.merge_file(path)
+          merge_index.add(path: path, oid: rugged.write(file[:data], :blob), mode: file[:filemode])
+          merge_index.conflict_remove(path)
+        end
+      rescue RuntimeError # conflicts cannot be resolved
+        nil
+      end
+
       def run_git(args, chdir: path, env: {}, nice: false, include_stderr: false, lazy_block: nil, &block)
         cmd = [Gitlab.config.git.bin_path, *args]
         cmd.unshift("nice") if nice
diff --git a/ruby/proto/gitaly/operations_pb.rb b/ruby/proto/gitaly/operations_pb.rb
index b1604c8a6..b83e453be 100644
--- a/ruby/proto/gitaly/operations_pb.rb
+++ b/ruby/proto/gitaly/operations_pb.rb
@@ -76,6 +76,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :target_ref, :bytes, 5
       optional :message, :bytes, 6
       optional :first_parent_ref, :bytes, 7
+      optional :allow_conflicts, :bool, 8
     end
     add_message "gitaly.UserMergeToRefResponse" do
       optional :commit_id, :string, 1