fix(genapis): fix conflcit

Author: RoRoJ

pages/organizations-and-projects/additional-content/organization-quotas.mdx

@@ -222,10 +222,7 @@ Generative APIs are rate limited based on:
 | mistral-small-3.1-24b-instruct-2503	  | 300 | 600   |
 | mistral-small-3.2-24b-instruct-2506	  | 300 | 600   |
 | mistral-nemo-instruct-2407	  | 300 | 600    |
-<<<<<<< HEAD
-=======
 | voxtral-small-24b-2507	  | 300 | 600    |
->>>>>>> 238655665 (feat(genapi): update rate limits with voxstral)
 | pixtral-12b-2409		  | 300 | 600     |
 | qwen3-235b-a22b-instruct-2507	  | 300 | 600   |
 | qwen2.5-coder-32b-instruct	  | 300 | 600   |