diff --git a/owners.txt b/owners.txt
index a37c25c1fb7..20b1ac1b55f 100644
--- a/owners.txt
+++ b/owners.txt
@@ -1,5 +1,6 @@
 <<<<<<< Updated upstream
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 136564/rosskevin
 136596/raggadub
 141974/twinup
@@ -85,6 +86,8 @@
 =======
 >>>>>>> Stashed changes
 136558/techwraith
+=======
+>>>>>>> Stashed changes
 136854/vzaar
 141879/wirefreethought
 141085/collexion
@@ -122,7 +125,10 @@
 140628/atomia
 136598/markoj
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 =======
+=======
+>>>>>>> Stashed changes
 145426/ovenbits
 141648/abcminiuser
 141591/oreelll
@@ -138,7 +144,6 @@
 147612/says
 141652/daidungsi
 146600/cloudmatrix
-142656/preloaded
 141578/ykatkov
 141613/mfliorko
 141596/gemilo
@@ -160,15 +165,10 @@
 142712/ifad
 141681/pmcollins
 146610/slapfu
-143063/ilocus
 146474/pc-doctor
 141643/chiel
-142997/one-on-one
-142866/openframeworks
 141595/a42z
 141629/nadorix
-141906/Patient360
-141777/hep-gc
 146305/houseparty
 141608/nigelg
 141634/raxreal
@@ -176,18 +176,15 @@
 146420/gshiftlabs
 144605/recurly
 144099/quantmind
-142424/railsmx
 143392/bluetent
 141624/Nervenschmerz
 141583/huoyingrufeng
-142585/endevver
 146296/erskinedesign
 141673/railjoe
 141586/dscholtis
 144947/bigcomputing
 146792/phpcommunity
 141597/bigfriendvn
-143176/maven2
 141576/kzhvsonic
 141599/sorvi
 141638/thieleman
@@ -203,12 +200,9 @@
 141825/ksbiological
 141617/runningonfumes
 141603/gamep
-142178/playdar
-141810/outstand
 145930/trapeze
 141614/pierric
 147164/fawkesrobotics
-142992/trobz
 141594/guybo
 141575/matthiasbreuer
 141609/calleeming
@@ -218,7 +212,6 @@
 142614/left
 141668/skhal
 144383/dev-groups
-142373/w3canvas
 144607/tekpub
 145509/mikandi
 141630/aagd
@@ -232,33 +225,31 @@
 141610/alazdan
 146391/whattheythink
 141675/nsillik
-142864/wtg
 141625/jerryb8
-141899/blusky
-141974/twinup
 146872/playpower
 141582/kczarnog
 141674/maxiode
 141635/stevenleeg
 141823/erlide
 141602/yurizeleniy
-142336/peachworks
 145713/vikingco
 141662/kirv
 141647/wildwinter
-141619/un-zzz-ep
 141585/highflying
 141600/Qamber
 144259/simplyaccessible
 144205/codesensus
 141646/mcholka
-142880/sparkfun
 141640/ddf
 141666/cpmaynard
 141656/fokcep
 147654/siyelo
+<<<<<<< Updated upstream
 >>>>>>> Stashed changes
 =======
 andrekolodochka
 andrewn
 >>>>>>> Stashed changes
+=======
+p2pu
+>>>>>>> Stashed changes