chore: fix conflicts

Signed-off-by: Feynman Zhou <feynmanzhou@microsoft.com>

CODEOWNERS

@@ -1,13 +1,3 @@
-# Org-Level Owners (in alphabetical order)
-* @justincormack 
-* @niazfk
-* @stevelasker
+# Org-Level and repo-Level Owners (in alphabetical order). Please note this is only for the notaryproject/notaryproject repo
 
-# Repo-Level Owners (in alphabetical order)
-# Note: This is only for the notaryproject/notaryproject repo
-* @gokarnm
-* @priteshbandi
-* @shizhMSFT
-* @toddysm
-* @vaninrao10
-* @yizha1
+* @gokarnm @justincormack @niazfk @priteshbandi @stevelasker @shizhMSFT @toddysm @vaninrao10 @yizha1

MAINTAINERS

@@ -12,13 +12,3 @@ Shiwei Zhang <shizh@microsoft.com> (@shizhMSFT)
 Toddy Mladenov <toddysm@gmail.com> (@toddysm)
 Vani Rao <vaninrao@amazon.com> (@vaninrao10)
 Yi Zha <yizha1@microsoft.com> @yizha1
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
->>>>>>> 62ae4cf (Added CODEOWNERS and MAINTAINERS files (#240))
-=======
->>>>>>> 913957f (fix syntax error in CODEOWNERS file)
-=======
->>>>>>> d194f78 (fix syntax error in CODEOWNERS file)
-=======
->>>>>>> 62ae4cfe5495d57e9c23e32bc41948308da7226f