Fix conflicts

.all-contributorsrc

@@ -5,6 +5,21 @@
   "imageSize": 100,
   "commit": false,
   "contributors": [
+    {
+      "login": "quentinguidee",
+      "name": "Quentin",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/12123721?v=4",
+      "profile": "https://github.com/quentinguidee",
+      "contributions": [
+        "code",
+        "doc",
+        "design",
+        "maintenance",
+        "projectManagement",
+        "question",
+        "review"
+      ]
+    },
     {
       "login": "M4xi1m3",
       "name": "M4x1m3",

README.md

@@ -159,6 +159,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- markdownlint-disable -->
 <table>
   <tr>
+    <td align="center"><a href="https://github.com/quentinguidee"><img src="https://avatars0.githubusercontent.com/u/12123721?v=4" width="100px;" alt=""/><br /><sub><b>Quentin</b></sub></a><br /><a href="https://github.com/Omega-Numworks/Omega/commits?author=quentinguidee" title="Code">💻</a> <a href="https://github.com/Omega-Numworks/Omega/commits?author=quentinguidee" title="Documentation">📖</a> <a href="#design-quentinguidee" title="Design">🎨</a> <a href="#maintenance-quentinguidee" title="Maintenance">🚧</a> <a href="#projectManagement-quentinguidee" title="Project Management">📆</a> <a href="#question-quentinguidee" title="Answering Questions">💬</a> <a href="https://github.com/Omega-Numworks/Omega/pulls?q=is%3Apr+reviewed-by%3Aquentinguidee" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="https://M4xi1m3.github.io/"><img src="https://avatars0.githubusercontent.com/u/57234558?v=4" width="100px;" alt=""/><br /><sub><b>M4x1m3</b></sub></a><br /><a href="https://github.com/Omega-Numworks/Omega/commits?author=M4xi1m3" title="Code">💻</a> <a href="https://github.com/Omega-Numworks/Omega/issues?q=author%3AM4xi1m3" title="Bug reports">🐛</a> <a href="https://github.com/Omega-Numworks/Omega/commits?author=M4xi1m3" title="Documentation">📖</a> <a href="#ideas-M4xi1m3" title="Ideas, Planning, & Feedback">🤔</a> <a href="#question-M4xi1m3" title="Answering Questions">💬</a></td>
   </tr>
 </table>