Merge branch 'master' into add-chad-zoom-moderator

Author: chadmcrowell

communication/moderators.md

@@ -227,11 +227,8 @@ Administrators seats: 6
 | Ihor Dvoretskyi | @ihor.dvoretskyi    | EMEA     | [EET - Eastern European Time](https://time.is/EET)      |
 | Marky Jackson   | @markyjackson-taulia| Americas | [PT - Pacific Time (US West Coast)](https://time.is/PT) |
 | Nigel Brown     | @nigel              | Americas | [CT - Central Time (US Central)](https://time.is/CT)    |
-<<<<<<< HEAD
 | Chad Crowell    | @chad               | EMEA     | [CET - Central European Time](https://time.is/CET)      |
-=======
 | Chris Short     | @chris-short        | Americas | [ET - Eastern Time (US East Coast)](https://time.is/ET) |
->>>>>>> ec93dba7 (Add Chris Short to moderators list)
 
 - License and main account controlled by the CNCF