diff --git a/CODEOWNERS b/CODEOWNERS
index 4a19fc871b5..5bdc509ad18 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -3,22 +3,36 @@
 # These owners will be the default owners for everything in
 # the repo. Unless a later match takes precedence,
 
+<<<<<<< HEAD
 erpnext/accounts/               @deepeshgarg007 @ruthra-kumar
 erpnext/assets/                 @khushi8112 @deepeshgarg007
 erpnext/regional                @deepeshgarg007 @ruthra-kumar
 erpnext/selling                 @deepeshgarg007 @ruthra-kumar
 erpnext/support/                @deepeshgarg007
 pos*                            
+=======
+erpnext/accounts/               @ruthra-kumar
+erpnext/assets/                 @khushi8112
+erpnext/regional                @ruthra-kumar
+erpnext/selling                 @ruthra-kumar
+erpnext/support/                @ruthra-kumar
+pos*                            @diptanilsaha
+>>>>>>> b9b3302b69 (Update CODEOWNERS)
 
-erpnext/buying/                 @rohitwaghchaure
+erpnext/buying/                 @rohitwaghchaure @mihir-kandoi
 erpnext/maintenance/            @rohitwaghchaure
-erpnext/manufacturing/          @rohitwaghchaure
+erpnext/manufacturing/          @rohitwaghchaure @mihir-kandoi
 erpnext/quality_management/     @rohitwaghchaure
-erpnext/stock/                  @rohitwaghchaure
-erpnext/subcontracting          @rohitwaghchaure
+erpnext/stock/                  @rohitwaghchaure @mihir-kandoi
+erpnext/subcontracting          @mihir-kandoi
 
+<<<<<<< HEAD
 erpnext/controllers/            @deepeshgarg007 @rohitwaghchaure
 erpnext/patches/                @deepeshgarg007 
+=======
+erpnext/controllers/            @ruthra-kumar @rohitwaghchaure @mihir-kandoi
+erpnext/patches/                @ruthra-kumar
+>>>>>>> b9b3302b69 (Update CODEOWNERS)
 
 .github/                        @deepeshgarg007
 pyproject.toml                  @akhilnarang