fix conflict

.flake8

@@ -2,13 +2,20 @@
 max-line-length = 120
 max-complexity = 10
 ignore =
-    E501,  # line too long, it is covered by pylint
-    E722,  # bare except, bad practice, to be removed in the future
-    F401,  # imported but unused, too many violations, to be removed in the future
-    F811,  # redefinition of unused, to be removed in the future
-    C901   # code flow is too complex, too many violations, to be removed in the future
-    W503   # line break before binary operator effect on readability is subjective
-    W504   # line break after binary operator effect on readability is subjective
+    # line too long, it is covered by pylint
+    E501
+    # bare except, bad practice, to be removed in the future
+    E722
+    # imported but unused, too many violations, to be removed in the future
+    F401
+    # redefinition of unused, to be removed in the future
+    F811
+    # code flow is too complex, too many violations, to be removed in the future
+    C901
+    # line break before binary operator effect on readability is subjective
+    W503
+    # line break after binary operator effect on readability is subjective
+    W504
 exclude =
     */vendored_sdks
     docs

.github/CODEOWNERS

@@ -14,6 +14,8 @@
 
 /src/subscription/ @wilcobmsft
 
+/src/apic-extension/ @arpishahmsft
+
 /src/alias/ @Juliehzl
 
 /src/managementpartner/ @jeffrey-ace
@@ -150,16 +152,16 @@
 
 /src/kusto/ @ilayr @orhasban @astauben
 
-/src/appservice-kube/ @ebencarek @howang-ms @Juliehzl @LaylaLiu-gmail 
+/src/appservice-kube/ @ebencarek @howang-ms @Juliehzl @LaylaLiu-gmail
+
+/src/astronomer/ @kairu-ms @ZengTaoxu
 
 /src/custom-providers/ @jsntcy
 
 /src/costmanagement/ @kairu-ms @jsntcy
 
 /src/datafactory/ @kairu-ms @evelyn-ys @Juliehzl
 
-/src/blockchain/ @jsntcy
-
 /src/desktopvirtualization/ @changlong-liu
 
 /src/attestation/ @YalinLi0312 @houk-ms
@@ -242,7 +244,7 @@
 
 /src/containerapp/ @ruslany @sanchitmehta @ebencarek @JennyLawrance @howang-ms @vinisoto @chinadragon0515 @vturecek @torosent @pagariyaalok @Juliehzl @jijohn14
 
-/src/scvmm/ @nascarsayan
+/src/scvmm/ @nascarsayan @hsurana06
 
 /src/spring/ @yuwzho
 
@@ -252,7 +254,7 @@
 
 /src/fluid-relay/ @kairu-ms @necusjz @ZengTaoxu
 
-/src/fleet/ @pdaru
+/src/fleet/ @pdaru @ealianis
 
 /src/staticwebapp/ @strawnsc
 
@@ -292,6 +294,8 @@
 
 /src/alb/ @jaishals
 
+/src/aosm/ @sunnycarter
+
 /src/managedccfs/ @msftsettiy
 
 /src/acrquery/ @CarolineNB
@@ -309,3 +313,15 @@
 /src/graphservices/ @amatukmolina
 
 /src/site-recovery/ @calvinhzy
+
+/src/hdinsightonaks/ @aim-for-better @yuc-Li
+
+/src/network-analytics/ @pikanghosh1
+
+/src/azurelargeinstance/ @8Gitbrix
+
+/src/k8s-runtime/ @ddadaal @HE-Xinyu
+
+/src/mdp/ @ajaykn
+
+/src/azext_gallery-service-artifact/ @rohitbhoopalam