1 files changed, 45 insertions, 45 deletions
diff --git a/proto/go/gitalypb/conflicts.pb.go b/proto/go/gitalypb/conflicts.pb.go
index e93c9e9c1..058b8c443 100644
--- a/proto/go/gitalypb/conflicts.pb.go
+++ b/proto/go/gitalypb/conflicts.pb.go
@@ -534,51 +534,51 @@ func init() {
 func init() { proto.RegisterFile("conflicts.proto", fileDescriptor_28fc8937e7d75862) }
 
 var fileDescriptor_28fc8937e7d75862 = []byte{
-	// 690 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x94, 0xc1, 0x4e, 0xdb, 0x4a,
-	0x14, 0x86, 0x99, 0x24, 0x84, 0xe4, 0x60, 0x20, 0x8c, 0xee, 0x15, 0x26, 0x12, 0x22, 0x84, 0x8b,
-	0x94, 0x5b, 0xb5, 0x09, 0xa2, 0x5d, 0xb0, 0x43, 0x0a, 0xa2, 0x45, 0xa8, 0xa8, 0xd5, 0xb4, 0xdd,
-	0x74, 0x63, 0x39, 0xf6, 0xe0, 0x4c, 0x65, 0x7b, 0xdc, 0x99, 0x31, 0x52, 0x9e, 0xa4, 0x5d, 0x76,
-	0xd1, 0x37, 0xe8, 0xa2, 0x6f, 0xd0, 0x57, 0xe8, 0xbb, 0x74, 0x55, 0x79, 0xc6, 0x76, 0x02, 0x49,
-	0xe8, 0xaa, 0x3b, 0xfb, 0x3f, 0xdf, 0x9c, 0x73, 0x66, 0xce, 0x3f, 0x03, 0x5b, 0x1e, 0x8f, 0x6f,
-	0x42, 0xe6, 0x29, 0xd9, 0x4f, 0x04, 0x57, 0x1c, 0xd7, 0x03, 0xa6, 0xdc, 0x70, 0xd2, 0x86, 0x90,
-	0xc5, 0xca, 0x68, 0x6d, 0x4b, 0x8e, 0x5d, 0x41, 0xfd, 0xfc, 0x6f, 0x3f, 0xe0, 0x3c, 0x08, 0xe9,
-	0x40, 0xff, 0x8d, 0xd2, 0x9b, 0x81, 0x62, 0x11, 0x95, 0xca, 0x8d, 0x12, 0x03, 0x74, 0xbf, 0x22,
-	0xb0, 0x5f, 0x32, 0xa9, 0xce, 0xf3, 0xd4, 0xcf, 0x59, 0x48, 0x25, 0xa1, 0x1f, 0x53, 0x2a, 0x15,
-	0x3e, 0x05, 0x10, 0x34, 0xe1, 0x92, 0x29, 0x2e, 0x26, 0x36, 0xea, 0xa0, 0xde, 0xfa, 0x09, 0xee,
-	0x9b, 0xa2, 0x7d, 0x52, 0x46, 0x86, 0xb5, 0xcf, 0x3f, 0x1e, 0x23, 0x32, 0xc3, 0xe2, 0xff, 0x60,
-	0x93, 0xa7, 0xc2, 0xf1, 0x78, 0x14, 0x31, 0xe5, 0x70, 0xe6, 0xdb, 0x95, 0x0e, 0xea, 0x35, 0x89,
-	0xc5, 0x53, 0x71, 0xae, 0xc5, 0x57, 0xcc, 0xc7, 0x3d, 0x68, 0xa9, 0x31, 0x65, 0x77, 0xb8, 0xaa,
-	0xe6, 0x36, 0xb5, 0x5e, 0x92, 0xdd, 0x6f, 0x08, 0xf0, 0x6c, 0x8b, 0x97, 0xd4, 0xf5, 0xa9, 0xc0,
-	0x7b, 0x00, 0x73, 0x25, 0x9a, 0x5e, 0x99, 0x7f, 0x0f, 0xc0, 0xe4, 0x4f, 0x5c, 0x35, 0xd6, 0x99,
-	0x2d, 0xd2, 0xd4, 0xca, 0x6b, 0x57, 0x8d, 0xf1, 0x2e, 0x34, 0xb2, 0x26, 0x75, 0xb0, 0xa6, 0x83,
-	0x6b, 0x3c, 0xbd, 0x13, 0x8a, 0xb8, 0x4f, 0xed, 0xd5, 0x0e, 0xea, 0xad, 0xea, 0xd0, 0x35, 0xf7,
-	0x29, 0x3e, 0x84, 0x0d, 0x37, 0xf6, 0xa8, 0x54, 0x3c, 0x5f, 0x5a, 0xd7, 0x4b, 0xad, 0x42, 0xcc,
-	0xd6, 0x5f, 0xd5, 0x1a, 0xa8, 0x55, 0xe9, 0x4e, 0xc0, 0x9a, 0x6d, 0x1a, 0x3f, 0x83, 0xfa, 0x58,
-	0x37, 0x9e, 0x9f, 0x65, 0xbb, 0x38, 0xcb, 0xf9, 0xad, 0x5d, 0xae, 0x90, 0x9c, 0xc5, 0x6d, 0x58,
-	0xf3, 0x78, 0xac, 0x68, 0xac, 0xf4, 0x0e, 0xad, 0xcb, 0x15, 0x52, 0x08, 0xc3, 0x1d, 0xf8, 0xb7,
-	0x30, 0x85, 0x73, 0xc3, 0x42, 0xea, 0x24, 0xee, 0x24, 0xe4, 0xae, 0xdf, 0x7d, 0x01, 0xbb, 0x0b,
-	0xc6, 0x2a, 0x13, 0x1e, 0x4b, 0x8a, 0x1f, 0xc1, 0x6a, 0x06, 0x4b, 0x1b, 0x75, 0xaa, 0xbd, 0xf5,
-	0x93, 0x7f, 0x16, 0xb5, 0x41, 0x0c, 0xd2, 0xfd, 0x5e, 0x85, 0x3d, 0x42, 0x25, 0x0f, 0x6f, 0x69,
-	0x11, 0x2e, 0xfc, 0x91, 0x0f, 0xe1, 0x6f, 0xbb, 0xe4, 0x0c, 0xb6, 0x95, 0x2b, 0x02, 0xaa, 0x9c,
-	0x99, 0x32, 0xd5, 0x65, 0x65, 0x48, 0xcb, 0xc0, 0x53, 0x65, 0xa1, 0xcd, 0x6a, 0x8b, 0x6c, 0x96,
-	0xcd, 0x56, 0xf2, 0x54, 0x78, 0xd4, 0x19, 0x09, 0x37, 0xf6, 0xc6, 0x7a, 0xf6, 0x16, 0xb1, 0x8c,
-	0x38, 0xd4, 0x5a, 0x06, 0xe5, 0xfd, 0xe4, 0x50, 0x6e, 0x00, 0x23, 0xe6, 0xd0, 0x11, 0x6c, 0xe6,
-	0xd5, 0x22, 0x2a, 0xa5, 0x1b, 0x50, 0x7b, 0x4d, 0x53, 0x1b, 0x46, 0xbd, 0x36, 0x22, 0xee, 0x40,
-	0x2d, 0x95, 0x54, 0xd8, 0x0d, 0xbd, 0x1d, 0xab, 0xd8, 0xce, 0x3b, 0x49, 0x05, 0xd1, 0x11, 0x7c,
-	0x0a, 0xcd, 0xf2, 0xce, 0xda, 0xcd, 0xc2, 0x36, 0xfa, 0x56, 0xf7, 0x8b, 0x5b, 0xdd, 0x7f, 0x5b,
-	0x10, 0x64, 0x0a, 0x77, 0xbf, 0x20, 0xd8, 0x59, 0x32, 0x39, 0x7c, 0x76, 0xcf, 0x89, 0x47, 0xd3,
-	0x83, 0x7c, 0x60, 0xd4, 0x33, 0xa6, 0xdc, 0x07, 0xd0, 0xfe, 0x70, 0x3e, 0x48, 0x1e, 0x97, 0xbe,
-	0x6c, 0x6a, 0xed, 0x4a, 0xf2, 0x78, 0x78, 0x08, 0x07, 0xc2, 0xe4, 0x72, 0xca, 0x67, 0xcb, 0x11,
-	0x26, 0x5b, 0xe9, 0xd2, 0x0b, 0xb0, 0xe7, 0x0b, 0xe6, 0x26, 0xfd, 0x1f, 0x5a, 0x3a, 0x41, 0xaa,
-	0x18, 0x8f, 0x1d, 0x2a, 0x04, 0x37, 0xcd, 0x36, 0xc9, 0xd6, 0x54, 0xbf, 0xc8, 0xe4, 0x93, 0x9f,
-	0x08, 0x5a, 0x65, 0x82, 0x37, 0x54, 0xdc, 0x32, 0x8f, 0xe2, 0x11, 0x6c, 0xcf, 0xdd, 0x00, 0xdc,
-	0x29, 0xf6, 0xb9, 0xec, 0xcd, 0x6b, 0x1f, 0x3c, 0x40, 0x98, 0xce, 0xba, 0xf5, 0x5f, 0x9f, 0x7a,
-	0x95, 0x46, 0xe5, 0x18, 0x61, 0x07, 0x5a, 0xf7, 0xfb, 0xc7, 0xfb, 0x7f, 0x38, 0xca, 0x76, 0x67,
-	0x39, 0x70, 0xa7, 0x00, 0xea, 0xa1, 0xe1, 0xf1, 0xfb, 0x0c, 0x0e, 0xdd, 0x51, 0xdf, 0xe3, 0xd1,
-	0xc0, 0x7c, 0x3e, 0xe1, 0x22, 0x18, 0x98, 0x14, 0xe6, 0x5d, 0x1f, 0x04, 0x3c, 0xff, 0x4f, 0x46,
-	0xa3, 0xba, 0x96, 0x9e, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xf2, 0xc4, 0x6e, 0x87, 0x2d, 0x06,
-	0x00, 0x00,
+	// 693 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x54, 0x41, 0x6f, 0xd3, 0x3c,
+	0x18, 0x9e, 0xdb, 0xae, 0x6b, 0xdf, 0x65, 0x5b, 0x67, 0x7d, 0x9f, 0x96, 0x55, 0x9a, 0xd6, 0x75,
+	0x4c, 0x2a, 0x08, 0x5a, 0x28, 0x3b, 0xec, 0x36, 0xa9, 0xd3, 0x60, 0x9a, 0x98, 0x40, 0x06, 0x2e,
+	0x5c, 0xa2, 0x34, 0xf1, 0x52, 0xa3, 0x24, 0x0e, 0xb6, 0x33, 0xa9, 0xbf, 0x04, 0x8e, 0x1c, 0xf8,
+	0x07, 0x1c, 0xf8, 0x07, 0xfc, 0x05, 0xfe, 0x0b, 0x27, 0x54, 0x3b, 0x49, 0xbb, 0xb5, 0x1d, 0x27,
+	0x6e, 0xc9, 0xf3, 0x3e, 0x7e, 0xde, 0xc7, 0x7e, 0x1f, 0x1b, 0xb6, 0x3c, 0x1e, 0x5f, 0x87, 0xcc,
+	0x53, 0xb2, 0x9b, 0x08, 0xae, 0x38, 0xae, 0x06, 0x4c, 0xb9, 0xe1, 0xb8, 0x09, 0x21, 0x8b, 0x95,
+	0xc1, 0x9a, 0x96, 0x1c, 0xb9, 0x82, 0xfa, 0xd9, 0xdf, 0x7e, 0xc0, 0x79, 0x10, 0xd2, 0x9e, 0xfe,
+	0x1b, 0xa6, 0xd7, 0x3d, 0xc5, 0x22, 0x2a, 0x95, 0x1b, 0x25, 0x86, 0xd0, 0xfe, 0x86, 0xc0, 0x7e,
+	0xc5, 0xa4, 0x3a, 0xcb, 0xa4, 0x5f, 0xb0, 0x90, 0x4a, 0x42, 0x3f, 0xa5, 0x54, 0x2a, 0x7c, 0x02,
+	0x20, 0x68, 0xc2, 0x25, 0x53, 0x5c, 0x8c, 0x6d, 0xd4, 0x42, 0x9d, 0xf5, 0x3e, 0xee, 0x9a, 0xa6,
+	0x5d, 0x52, 0x54, 0x06, 0x95, 0x2f, 0x3f, 0x1f, 0x23, 0x32, 0xc3, 0xc5, 0x0f, 0x60, 0x93, 0xa7,
+	0xc2, 0xf1, 0x78, 0x14, 0x31, 0xe5, 0x70, 0xe6, 0xdb, 0xa5, 0x16, 0xea, 0xd4, 0x89, 0xc5, 0x53,
+	0x71, 0xa6, 0xc1, 0xd7, 0xcc, 0xc7, 0x1d, 0x68, 0xa8, 0x11, 0x65, 0xb7, 0x78, 0x65, 0xcd, 0xdb,
+	0xd4, 0x78, 0xc1, 0x6c, 0x7f, 0x47, 0x80, 0x67, 0x2d, 0x5e, 0x50, 0xd7, 0xa7, 0x02, 0xef, 0x01,
+	0xcc, 0xb5, 0xa8, 0x7b, 0x85, 0xfe, 0x1e, 0x80, 0xd1, 0x4f, 0x5c, 0x35, 0xd2, 0xca, 0x16, 0xa9,
+	0x6b, 0xe4, 0x8d, 0xab, 0x46, 0x78, 0x17, 0x6a, 0x13, 0x93, 0xba, 0x58, 0xd1, 0xc5, 0x35, 0x9e,
+	0xde, 0x2a, 0x45, 0xdc, 0xa7, 0xf6, 0x6a, 0x0b, 0x75, 0x56, 0x75, 0xe9, 0x8a, 0xfb, 0x14, 0x1f,
+	0xc2, 0x86, 0x1b, 0x7b, 0x54, 0x2a, 0x9e, 0x2d, 0xad, 0xea, 0xa5, 0x56, 0x0e, 0x4e, 0xd6, 0x5f,
+	0x56, 0x6a, 0xa8, 0x51, 0x6a, 0x8f, 0xc1, 0x9a, 0x35, 0x8d, 0x8f, 0xa1, 0x3a, 0xd2, 0xc6, 0xb3,
+	0xb3, 0x6c, 0xe6, 0x67, 0x39, 0xbf, 0xb5, 0x8b, 0x15, 0x92, 0x71, 0x71, 0x13, 0xd6, 0x3c, 0x1e,
+	0x2b, 0x1a, 0x2b, 0xbd, 0x43, 0xeb, 0x62, 0x85, 0xe4, 0xc0, 0x60, 0x07, 0xfe, 0xcf, 0x43, 0xe1,
+	0x5c, 0xb3, 0x90, 0x3a, 0x89, 0x3b, 0x0e, 0xb9, 0xeb, 0xb7, 0x5f, 0xc2, 0xee, 0x82, 0xb1, 0xca,
+	0x84, 0xc7, 0x92, 0xe2, 0x47, 0xb0, 0x3a, 0x21, 0x4b, 0x1b, 0xb5, 0xca, 0x9d, 0xf5, 0xfe, 0x7f,
+	0x8b, 0x6c, 0x10, 0x43, 0x69, 0xff, 0x28, 0xc3, 0x1e, 0xa1, 0x92, 0x87, 0x37, 0x34, 0x2f, 0xe7,
+	0xf9, 0xc8, 0x86, 0xf0, 0xaf, 0x53, 0x72, 0x0a, 0xdb, 0xca, 0x15, 0x01, 0x55, 0xce, 0x4c, 0x9b,
+	0xf2, 0xb2, 0x36, 0xa4, 0x61, 0xc8, 0x53, 0x64, 0x61, 0xcc, 0x2a, 0x8b, 0x62, 0x36, 0x99, 0xad,
+	0xe4, 0xa9, 0xf0, 0xa8, 0x33, 0x14, 0x6e, 0xec, 0x8d, 0xf4, 0xec, 0x2d, 0x62, 0x19, 0x70, 0xa0,
+	0xb1, 0x09, 0x29, 0xf3, 0x93, 0x91, 0xb2, 0x00, 0x18, 0x30, 0x23, 0x1d, 0xc1, 0x66, 0xd6, 0x2d,
+	0xa2, 0x52, 0xba, 0x01, 0xb5, 0xd7, 0x34, 0x6b, 0xc3, 0xa0, 0x57, 0x06, 0xc4, 0x2d, 0xa8, 0xa4,
+	0x92, 0x0a, 0xbb, 0xa6, 0xb7, 0x63, 0xe5, 0xdb, 0x79, 0x2f, 0xa9, 0x20, 0xba, 0x82, 0x4f, 0xa0,
+	0x5e, 0xdc, 0x59, 0xbb, 0x9e, 0xc7, 0x46, 0xdf, 0xea, 0x6e, 0x7e, 0xab, 0xbb, 0xef, 0x72, 0x06,
+	0x99, 0x92, 0xdb, 0x5f, 0x11, 0xec, 0x2c, 0x99, 0x1c, 0x3e, 0xbd, 0x93, 0xc4, 0xa3, 0xe9, 0x41,
+	0xde, 0x33, 0xea, 0x99, 0x50, 0xee, 0x03, 0xe8, 0x7c, 0x38, 0x1f, 0x25, 0x8f, 0x8b, 0x5c, 0xd6,
+	0x35, 0x76, 0x29, 0x79, 0x3c, 0x38, 0x84, 0x03, 0x61, 0xb4, 0x9c, 0xe2, 0xd9, 0x72, 0x84, 0x51,
+	0x2b, 0x52, 0x7a, 0x0e, 0xf6, 0x7c, 0xc3, 0x2c, 0xa4, 0x0f, 0xa1, 0xa1, 0x05, 0x52, 0xc5, 0x78,
+	0xec, 0x50, 0x21, 0xb8, 0x31, 0x5b, 0x27, 0x5b, 0x53, 0xfc, 0x7c, 0x02, 0xf7, 0x7f, 0x21, 0x68,
+	0x14, 0x02, 0x6f, 0xa9, 0xb8, 0x61, 0x1e, 0xc5, 0x43, 0xd8, 0x9e, 0xbb, 0x01, 0xb8, 0x95, 0xef,
+	0x73, 0xd9, 0x9b, 0xd7, 0x3c, 0xb8, 0x87, 0x61, 0x9c, 0xb5, 0xab, 0xbf, 0x3f, 0x77, 0x4a, 0xb5,
+	0xd2, 0x53, 0x84, 0x1d, 0x68, 0xdc, 0xf5, 0x8f, 0xf7, 0xff, 0x72, 0x94, 0xcd, 0xd6, 0x72, 0xc2,
+	0xad, 0x06, 0xa8, 0x83, 0x06, 0xc7, 0x1f, 0xfa, 0x01, 0x53, 0xa1, 0x3b, 0xec, 0x7a, 0x3c, 0xea,
+	0x99, 0xcf, 0x27, 0x5c, 0x04, 0x3d, 0x23, 0xd1, 0xbb, 0x79, 0x76, 0x6c, 0xde, 0xf6, 0x5e, 0xc0,
+	0x33, 0x2c, 0x19, 0x0e, 0xab, 0x1a, 0x7a, 0xfe, 0x27, 0x00, 0x00, 0xff, 0xff, 0xf8, 0xeb, 0x3e,
+	0x5a, 0x31, 0x06, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.