Resolve merge conflicts

.all-contributorsrc

@@ -3426,6 +3426,34 @@
         "security"
       ]
     },
+    {
+      "login": "BrodyWills",
+      "name": "Brody",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10367244?v=4",
+      "profile": "https://github.com/BrodyWills",
+      "contributions": [
+        "question",
+        "bug"
+      ]
+    },
+    {
+      "login": "daivydking",
+      "name": "David Chuku",
+      "avatar_url": "https://avatars.githubusercontent.com/u/99464402?v=4",
+      "profile": "https://github.com/daivydking",
+      "contributions": [
+        "bug"
+      ]
+    },
+    {
+      "login": "irisxvii",
+      "name": "iris mariah kurien",
+      "avatar_url": "https://avatars.githubusercontent.com/u/140954119?v=4",
+      "profile": "https://github.com/irisxvii",
+      "contributions": [
+        "content"
+      ]
+    },
     {
       "login": "Aftar-Ahmad-Sami",
       "name": "Aftar Ahmad Sami",

README.md

@@ -34,7 +34,7 @@ All contributors are required to abide by our [Code of Conduct](https://github.c
 ## All Contributors
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-236-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-239-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 ## ✨ Contributors
@@ -348,6 +348,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/RayX81194"><img src="https://avatars.githubusercontent.com/u/111891431?v=4?s=100" width="100px;" alt="ray"/><br /><sub><b>ray</b></sub></a><br /><a href="#question-RayX81194" title="Answering Questions">💬</a> <a href="#audio-RayX81194" title="Audio">🔊</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=RayX81194" title="Code">💻</a> <a href="#design-RayX81194" title="Design">🎨</a> <a href="#ideas-RayX81194" title="Ideas, Planning, & Feedback">🤔</a> <a href="#talk-RayX81194" title="Talks">📢</a> <a href="#video-RayX81194" title="Videos">📹</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/hakeemyusuff"><img src="https://avatars.githubusercontent.com/u/105215519?v=4?s=100" width="100px;" alt="HakeemYusuff"/><br /><sub><b>HakeemYusuff</b></sub></a><br /><a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=hakeemyusuff" title="Code">💻</a> <a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=hakeemyusuff" title="Documentation">📖</a> <a href="#maintenance-hakeemyusuff" title="Maintenance">🚧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Luca1905"><img src="https://avatars.githubusercontent.com/u/71080491?v=4?s=100" width="100px;" alt="Luca Wang"/><br /><sub><b>Luca Wang</b></sub></a><br /><a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=Luca1905" title="Code">💻</a> <a href="#infra-Luca1905" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#security-Luca1905" title="Security">🛡️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/BrodyWills"><img src="https://avatars.githubusercontent.com/u/10367244?v=4?s=100" width="100px;" alt="Brody"/><br /><sub><b>Brody</b></sub></a><br /><a href="#question-BrodyWills" title="Answering Questions">💬</a> <a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3ABrodyWills" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/daivydking"><img src="https://avatars.githubusercontent.com/u/99464402?v=4?s=100" width="100px;" alt="David Chuku"/><br /><sub><b>David Chuku</b></sub></a><br /><a href="https://github.com/TejasQ/opensauced-guestbook/issues?q=author%3Adaivydking" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/irisxvii"><img src="https://avatars.githubusercontent.com/u/140954119?v=4?s=100" width="100px;" alt="iris mariah kurien"/><br /><sub><b>iris mariah kurien</b></sub></a><br /><a href="#content-irisxvii" title="Content">🖋</a></td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Aftar-Ahmad-Sami"><img src="https://avatars.githubusercontent.com/u/82672770?v=4?s=100" width="100px;" alt="Aftar Ahmad Sami"/><br /><sub><b>Aftar Ahmad Sami</b></sub></a><br /><a href="https://github.com/TejasQ/opensauced-guestbook/commits?author=Aftar-Ahmad-Sami" title="Code">💻</a> <a href="#data-Aftar-Ahmad-Sami" title="Data">🔣</a> <a href="#ideas-Aftar-Ahmad-Sami" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-Aftar-Ahmad-Sami" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#research-Aftar-Ahmad-Sami" title="Research">🔬</a> <a href="#tool-Aftar-Ahmad-Sami" title="Tools">🔧</a></td>
     </tr>
   </tbody>