diff --git a/CODEOWNERS b/CODEOWNERS
index 5bdc509ad18..a0c68b87789 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -3,21 +3,12 @@
 # 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 @mihir-kandoi
 erpnext/maintenance/            @rohitwaghchaure
@@ -26,13 +17,8 @@ erpnext/quality_management/     @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
+.github/                        @ruthra-kumar
 pyproject.toml                  @akhilnarang