diff --git a/owners.txt b/owners.txt
index 618232ba3d..bd57e69fda 100644
--- a/owners.txt
+++ b/owners.txt
@@ -1,11 +1,6 @@
 <<<<<<< Updated upstream
 =======
 >>>>>>> Stashed changes
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-=======
->>>>>>> Stashed changes
 128237/clicknpunch
 128244/dchide01
 128175/heysuck
@@ -13,11 +8,7 @@
 128259/hnrk75
 133465/majisti
 128178/davidrabbit
-=======
->>>>>>> Stashed changes
 128522/melexis
-<<<<<<< Updated upstream
-=======
 129083/biguniverse
 131804/Speicher210
 128261/jadsaklawi
@@ -91,7 +82,6 @@
 128249/vrai
 130896/pkp
 134730/alphaonelabs
->>>>>>> Stashed changes
 128190/jkgurto
 132833/onixmedia
 128179/morecho
@@ -159,16 +149,3 @@
 128304/rainerstudhalter
 128310/thebos1
 128279/islocated
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-wallace
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
-=======
-GoogleContainerTools
-tibroc
-unhookd
->>>>>>> Stashed changes