fix: resolve merge conflicts

Author: adiati98

2025.md

@@ -167,9 +167,13 @@ You can list your contributions in the table below.
 | Govind S Nair (@G0v1ndD3v) | [https://github.com/mautic/low-no-code/issues/156](https://github.com/mautic/low-no-code/issues/156) | Kicked off Hindi translation; completed AddonBundle flashes and messages |
 | Govind S Nair (@G0v1ndD3v) | [https://github.com/mautic/low-no-code/issues/157](https://github.com/mautic/low-no-code/issues/157) | Added Hindi translation for APIBundle flashes and messages |
 | Govind S Nair (@G0v1ndD3v) | [https://github.com/mautic/low-no-code/issues/159](https://github.com/mautic/low-no-code/issues/159) | Added Hindi translation for CalendarBundle messages |
+| Govind S Nair (@G0v1ndD3v) | [https://github.com/mautic/low-no-code/issues/161](https://github.com/mautic/low-no-code/issues/161) | Added Hindi translation for CategoryBundle messages, flashes and validators |
+| Govind S Nair (@G0v1ndD3v) | [https://github.com/mautic/low-no-code/issues/162](https://github.com/mautic/low-no-code/issues/162) | Added Hindi translation for ChannelBundle javascript, messages, and validators |
 | Govind S Nair (@G0v1ndD3v) | [https://github.com/mautic/low-no-code/issues/163](https://github.com/mautic/low-no-code/issues/163) | Added Hindi translation for ChatBundle messages and validators |
+| Govind S Nair (@G0v1ndD3v) | [https://github.com/mautic/low-no-code/issues/164](https://github.com/mautic/low-no-code/issues/164) | Added Hindi translation for ConfigBundle messages and flashes |
 | Govind S Nair (@G0v1ndD3v) | [https://github.com/mautic/low-no-code/issues/174](https://github.com/mautic/low-no-code/issues/174) | Added Hindi translation for HelloWorldBundle messages |
 | Ayu Adiati (@adiati98) | [https://www.youtube.com/watch?v=Hnzp-aJ4NWA](https://www.youtube.com/watch?v=Hnzp-aJ4NWA) | Created a video tutorial Setting up your local environment to work with the Mautic Documentation |
 | Ayu Adiati (@adiati98) | [https://www.youtube.com/watch?v=jP-7LEyNo_k](https://www.youtube.com/watch?v=jP-7LEyNo_k) | Created a video tutorial How to create a PR in the low and no code repository for your contribution to be counted |
 | Oluwaseun Oladeji (@oluwaseunoladeji) | [https://github.com/mautic/low-no-code/issues/148](https://github.com/mautic/low-no-code/issues/148) | Added Quarterly activity report form + guide for Ambassadors |
 | Grace Chibueze (@grachiyoung1) | [https://docs.google.com/document/d/1bI7R6nl3tIo4PGHgyvk01OK5ryokXdrHUnzpzqChz9c/edit?tab=t.0](https://docs.google.com/document/d/1bI7R6nl3tIo4PGHgyvk01OK5ryokXdrHUnzpzqChz9c/edit?tab=t.0) | Wrote a Community Spotlight for Rahul Shinde |
+| Oluwaseun Oladeji (@oluwaseunoladeji) | [https://github.com/mautic/low-no-code/issues/13](https://github.com/mautic/low-no-code/issues/13) | Added Community Improvement process for advancing Mautic users into volunteers |