diff --git a/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/build-model-8.md b/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/build-model-8.md
index 560ea92f0f..9a04810222 100644
--- a/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/build-model-8.md
+++ b/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/build-model-8.md
@@ -8,7 +8,6 @@ weight: 7 # 1 is first, 2 is second, etc.
 layout: "learningpathall"
 ---
 
-TODO connect this part with the FVP/board?
 With our environment ready, you can create a simple program to test the setup.
 
 This example defines a small feedforward neural network for a classification task. The model consists of 2 linear layers with ReLU activation in between.
@@ -62,7 +61,7 @@ print("Model successfully exported to simple_nn.pte")
 
 Run the model from the Linux command line:
 
-```console
+```bash
 python3 simple_nn.py
 ```
 
@@ -76,7 +75,7 @@ The model is saved as a .pte file, which is the format used by ExecuTorch for de
 
 Run the ExecuTorch version, first build the executable:
 
-```console
+```bash
 # Clean and configure the build system
 (rm -rf cmake-out && mkdir cmake-out && cd cmake-out && cmake ..)
 
@@ -84,7 +83,7 @@ Run the ExecuTorch version, first build the executable:
 cmake --build cmake-out --target executor_runner -j$(nproc)
 ```
 
-You see the build output and it ends with:
+You will see the build output and it ends with:
 
 ```output
 [100%] Linking CXX executable executor_runner
@@ -93,7 +92,7 @@ You see the build output and it ends with:
 
 When the build is complete, run the executor_runner with the model as an argument:
 
-```console
+```bash
 ./cmake-out/executor_runner --model_path simple_nn.pte
 ```
 
@@ -112,3 +111,30 @@ Output 0: tensor(sizes=[1, 2], [-0.105369, -0.178723])
 
 When the model execution completes successfully, you’ll see confirmation messages similar to those above, indicating successful loading, inference, and output tensor shapes.
 
+
+
+TODO: Debug issues when running the model on the FVP, kindly ignore anything below this 
+## Running the model on the Corstone-300 FVP 
+
+
+Run the model using: 
+
+```bash
+FVP_Corstone_SSE-300_Ethos-U55 -a simple_nn.pte -C mps3_board.visualisation.disable-visualisation=1
+```
+
+{{% notice Note %}}
+
+-C mps3_board.visualisation.disable-visualisation=1 disables the FVP GUI. This can speed up launch time for the FVP.
+
+The FVP can be terminated with Ctrl+C.
+{{% /notice %}}
+
+
+
+```output
+ 
+```
+
+
+You've now set up your environment for TinyML development, and tested a PyTorch and ExecuTorch Neural Network.
\ No newline at end of file
diff --git a/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/env-setup-5.md b/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/env-setup-5.md
index 4372f97265..31af1f637f 100644
--- a/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/env-setup-5.md
+++ b/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/env-setup-5.md
@@ -61,4 +61,4 @@ pkill -f buck
 
 If you don't have the Grove AI vision board, use the Corstone-300 FVP proceed to [Environment Setup Corstone-300 FVP](/learning-paths/microcontrollers/introduction-to-tinyml-on-arm/env-setup-6-fvp/)
 
-If you have the Grove board proceed o to [Setup on Grove - Vision AI Module V2](/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/setup-7-grove/)
\ No newline at end of file
+If you have the Grove board proceed to [Setup on Grove - Vision AI Module V2](/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/setup-7-grove/)
\ No newline at end of file
diff --git a/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/env-setup-6-FVP.md b/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/env-setup-6-FVP.md
index f43e5d74ac..42d2d53d59 100644
--- a/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/env-setup-6-FVP.md
+++ b/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/env-setup-6-FVP.md
@@ -26,6 +26,4 @@ Test that the setup was successful by running the `run.sh` script.
 ./run.sh
 ```
 
-TODO connect this part to simple_nn.py part?
-
-You will see a number of examples run on the FVP. This means you can proceed to the next section to test your environment setup.
+You will see a number of examples run on the FVP. This means you can proceed to the next section [Build a Simple PyTorch Model](/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/build-model-8/) to test your environment setup.
\ No newline at end of file
diff --git a/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/setup-7-Grove.md b/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/setup-7-Grove.md
index 27c9c6ff7e..9d1fbb4c58 100644
--- a/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/setup-7-Grove.md
+++ b/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/setup-7-Grove.md
@@ -35,6 +35,9 @@ Grove Vision V2 [Edge impulse Firmware](https://cdn.edgeimpulse.com/firmware/see
 
 ![Board connection](Connect.png)
 
+{{% notice Note %}}
+Ensure the board is properly connected and recognized by your computer.
+{{% /notice %}}
 
 3. In the extracted Edge Impulse firmware, locate and run the installation scripts to flash your device. 
 
@@ -42,16 +45,6 @@ Grove Vision V2 [Edge impulse Firmware](https://cdn.edgeimpulse.com/firmware/see
 ./flash_linux.sh
 ```
 
-4. Configure Edge Impulse for the board
-in your terminal, run:
-
-```console
-edge-impulse-daemon
-```
-Follow the prompts to log in.
-
-5. If successful, you should see your Grove - Vision AI Module V2 under 'Devices' in Edge Impulse.
-
 
 ## Next Steps
 1. Go to [Build a Simple PyTorch Model](/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/build-model-8/) to test your environment setup.
diff --git a/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/troubleshooting-6.md b/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/troubleshooting-6.md
deleted file mode 100644
index 57b7585970..0000000000
--- a/content/learning-paths/embedded-and-microcontrollers/introduction-to-tinyml-on-arm/troubleshooting-6.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: Troubleshooting and Best Practices
-weight: 8
-
-### FIXED, DO NOT MODIFY
-layout: learningpathall
----
-
-TODO can these be incorporated in the LP?
-
-## Troubleshooting
-- If you encounter permission issues, try running the commands with sudo.
-- Ensure your Grove - Vision AI Module V2 is properly connected and recognized by your computer.
-- If Edge Impulse CLI fails to detect your device, try unplugging, hold the **Boot button** and replug the USB cable. Release the button once you replug.
-
-## Best Practices
-- Always cross-compile your code on the host machine to ensure compatibility with the target Arm device.
-- Utilize model quantization techniques to optimize performance on constrained devices like the Grove - Vision AI Module V2.
-- Regularly update your development environment and tools to benefit from the latest improvements in TinyML and edge AI technologies
-
-You've now set up your environment for TinyML development, and tested a PyTorch and ExecuTorch Neural Network.
\ No newline at end of file
diff --git a/data/stats_weekly_data.yml b/data/stats_weekly_data.yml
index 0075fc65a7..551955f57f 100644
--- a/data/stats_weekly_data.yml
+++ b/data/stats_weekly_data.yml
@@ -4006,6 +4006,17 @@
   content:
     cross-platform: 25
     embedded-systems: 19
+<<<<<<< HEAD
+    install-guides: 89
+    laptops-and-desktops: 32
+    microcontrollers: 25
+    servers-and-cloud-computing: 88
+    smartphones-and-mobile: 25
+    total: 303
+  contributions:
+    external: 43
+    internal: 353
+=======
     install-guides: 90
     laptops-and-desktops: 33
     microcontrollers: 25
@@ -4015,6 +4026,7 @@
   contributions:
     external: 43
     internal: 355
+>>>>>>> upstream/main
   github_engagement:
     num_forks: 30
     num_prs: 14
@@ -4046,7 +4058,11 @@
     graham-woodward: 1
     iago-calvo-lista,-arm: 1
     james-whitaker,-arm: 1
+<<<<<<< HEAD
+    jason-andrews: 89
+=======
     jason-andrews: 90
+>>>>>>> upstream/main
     joe-stech: 1
     johanna-skinnider: 2
     jonathan-davies: 2
@@ -4054,7 +4070,11 @@
     julie-gaskin: 4
     julio-suarez: 5
     kasper-mecklenburg: 1
+<<<<<<< HEAD
+    koki-mitsunami: 1
+=======
     koki-mitsunami: 2
+>>>>>>> upstream/main
     konstantinos-margaritis: 7
     kristof-beyls: 1
     liliya-wu: 1
@@ -4088,6 +4108,19 @@
     percent_closed_vs_total: 0.0
 - a_date: '2024-12-09'
   content:
+<<<<<<< HEAD
+    cross-platform: 25
+    embedded-systems: 19
+    install-guides: 89
+    laptops-and-desktops: 32
+    microcontrollers: 25
+    servers-and-cloud-computing: 88
+    smartphones-and-mobile: 25
+    total: 303
+  contributions:
+    external: 43
+    internal: 353
+=======
     cross-platform: 26
     embedded-systems: 19
     install-guides: 90
@@ -4099,18 +4132,30 @@
   contributions:
     external: 44
     internal: 354
+>>>>>>> upstream/main
   github_engagement:
     num_forks: 30
     num_prs: 7
   individual_authors:
+<<<<<<< HEAD
+    alaaeddine-chakroun: 1
+=======
     alaaeddine-chakroun: 2
+>>>>>>> upstream/main
     alexandros-lamprineas: 1
     annie-tallund: 1
     arm: 3
     arnaud-de-grandmaison: 1
     basma-el-gaabouri: 1
+<<<<<<< HEAD
+    ben-clark: 1
     bolt-liu: 2
     brenda-strech: 1
+    chaodong-gong,-alex-su,-kieran-hejmadi: 1
+=======
+    bolt-liu: 2
+    brenda-strech: 1
+>>>>>>> upstream/main
     chen-zhang: 1
     christopher-seidl: 7
     cyril-rohr: 1
@@ -4125,11 +4170,18 @@
     "fr\xE9d\xE9ric--lefred--descamps": 2
     gabriel-peterson: 5
     gayathri-narayana-yegna-narayanan: 1
+<<<<<<< HEAD
+    graham-woodward: 1
+    iago-calvo-lista,-arm: 1
+    james-whitaker,-arm: 1
+    jason-andrews: 89
+=======
     georgios-mermigkis-and-konstantinos-margaritis,-vectorcamp: 1
     graham-woodward: 1
     iago-calvo-lista,-arm: 1
     james-whitaker,-arm: 1
     jason-andrews: 90
+>>>>>>> upstream/main
     joe-stech: 1
     johanna-skinnider: 2
     jonathan-davies: 2
@@ -4137,7 +4189,10 @@
     julie-gaskin: 4
     julio-suarez: 5
     kasper-mecklenburg: 1
+<<<<<<< HEAD
+=======
     kieran-hejmadi: 1
+>>>>>>> upstream/main
     koki-mitsunami: 1
     konstantinos-margaritis: 7
     kristof-beyls: 1
@@ -4160,7 +4215,10 @@
     tianyu-li: 1
     tom-pilar: 1
     uma-ramalingam: 1
+<<<<<<< HEAD
+=======
     varun-chari,-albin-bernhardsson: 1
+>>>>>>> upstream/main
     varun-chari,-pareena-verma: 1
     visualsilicon: 1
     ying-yu: 1
@@ -4173,6 +4231,24 @@
     percent_closed_vs_total: 0.0
 - a_date: '2024-12-16'
   content:
+<<<<<<< HEAD
+    cross-platform: 25
+    embedded-systems: 19
+    install-guides: 89
+    laptops-and-desktops: 32
+    microcontrollers: 25
+    servers-and-cloud-computing: 88
+    smartphones-and-mobile: 25
+    total: 303
+  contributions:
+    external: 43
+    internal: 353
+  github_engagement:
+    num_forks: 30
+    num_prs: 9
+  individual_authors:
+    alaaeddine-chakroun: 1
+=======
     cross-platform: 26
     embedded-systems: 19
     install-guides: 90
@@ -4189,6 +4265,7 @@
     num_prs: 11
   individual_authors:
     alaaeddine-chakroun: 2
+>>>>>>> upstream/main
     alexandros-lamprineas: 1
     annie-tallund: 1
     arm: 3
@@ -4212,11 +4289,18 @@
     "fr\xE9d\xE9ric--lefred--descamps": 2
     gabriel-peterson: 5
     gayathri-narayana-yegna-narayanan: 1
+<<<<<<< HEAD
+    graham-woodward: 1
+    iago-calvo-lista,-arm: 1
+    james-whitaker,-arm: 1
+    jason-andrews: 89
+=======
     georgios-mermigkis-and-konstantinos-margaritis,-vectorcamp: 1
     graham-woodward: 1
     iago-calvo-lista,-arm: 1
     james-whitaker,-arm: 1
     jason-andrews: 90
+>>>>>>> upstream/main
     joe-stech: 1
     johanna-skinnider: 2
     jonathan-davies: 2
@@ -4224,7 +4308,10 @@
     julie-gaskin: 4
     julio-suarez: 5
     kasper-mecklenburg: 1
+<<<<<<< HEAD
+=======
     kieran-hejmadi: 1
+>>>>>>> upstream/main
     koki-mitsunami: 1
     konstantinos-margaritis: 7
     kristof-beyls: 1
@@ -4247,7 +4334,10 @@
     tianyu-li: 1
     tom-pilar: 1
     uma-ramalingam: 1
+<<<<<<< HEAD
+=======
     varun-chari,-albin-bernhardsson: 1
+>>>>>>> upstream/main
     varun-chari,-pareena-verma: 1
     visualsilicon: 1
     ying-yu: 1
@@ -4256,6 +4346,23 @@
     zhengjun-xing: 2
   issues:
     avg_close_time_hrs: 0
+<<<<<<< HEAD
+    num_issues: 12
+    percent_closed_vs_total: 0.0
+- a_date: '2024-12-23'
+  content:
+    cross-platform: 25
+    embedded-systems: 19
+    install-guides: 89
+    laptops-and-desktops: 32
+    microcontrollers: 25
+    servers-and-cloud-computing: 88
+    smartphones-and-mobile: 25
+    total: 303
+  contributions:
+    external: 43
+    internal: 353
+=======
     num_issues: 14
     percent_closed_vs_total: 0.0
 - a_date: '2024-12-23'
@@ -4271,16 +4378,24 @@
   contributions:
     external: 45
     internal: 362
+>>>>>>> upstream/main
   github_engagement:
     num_forks: 30
     num_prs: 8
   individual_authors:
+<<<<<<< HEAD
+    alaaeddine-chakroun: 1
+=======
     alaaeddine-chakroun: 2
+>>>>>>> upstream/main
     alexandros-lamprineas: 1
     annie-tallund: 1
     arm: 3
     arnaud-de-grandmaison: 1
+<<<<<<< HEAD
+=======
     arnaud-de-grandmaison,-paul-howard,-and-pareena-verma: 1
+>>>>>>> upstream/main
     basma-el-gaabouri: 1
     ben-clark: 1
     bolt-liu: 2
@@ -4292,7 +4407,11 @@
     daniel-gubay: 1
     daniel-nguyen: 1
     david-spickett: 2
+<<<<<<< HEAD
+    dawid-borycki: 30
+=======
     dawid-borycki: 31
+>>>>>>> upstream/main
     diego-russo: 1
     diego-russo-and-leandro-nunes: 1
     elham-harirpoush: 2
@@ -4300,11 +4419,18 @@
     "fr\xE9d\xE9ric--lefred--descamps": 2
     gabriel-peterson: 5
     gayathri-narayana-yegna-narayanan: 1
+<<<<<<< HEAD
+    graham-woodward: 1
+    iago-calvo-lista,-arm: 1
+    james-whitaker,-arm: 1
+    jason-andrews: 89
+=======
     georgios-mermigkis-and-konstantinos-margaritis,-vectorcamp: 1
     graham-woodward: 1
     iago-calvo-lista,-arm: 1
     james-whitaker,-arm: 1
     jason-andrews: 91
+>>>>>>> upstream/main
     joe-stech: 1
     johanna-skinnider: 2
     jonathan-davies: 2
@@ -4312,8 +4438,12 @@
     julie-gaskin: 4
     julio-suarez: 5
     kasper-mecklenburg: 1
+<<<<<<< HEAD
+    koki-mitsunami: 1
+=======
     kieran-hejmadi: 1
     koki-mitsunami: 2
+>>>>>>> upstream/main
     konstantinos-margaritis: 7
     kristof-beyls: 1
     liliya-wu: 1
@@ -4322,11 +4452,18 @@
     nikhil-gupta,-pareena-verma,-nobel-chowdary-mandepudi,-ravi-malhotra: 1
     odin-shen: 1
     owen-wu,-arm: 2
+<<<<<<< HEAD
+    pareena-verma: 35
+    pareena-verma,-annie-tallund: 1
+    pareena-verma,-jason-andrews,-and-zach-lasiuk: 1
+    pareena-verma,-joe-stech,-adnan-alsinan: 1
+=======
     pareena-verma: 34
     pareena-verma,-annie-tallund: 1
     pareena-verma,-jason-andrews,-and-zach-lasiuk: 1
     pareena-verma,-joe-stech,-adnan-alsinan: 1
     paul-howard: 1
+>>>>>>> upstream/main
     pranay-bakre: 4
     przemyslaw-wirkus: 1
     rin-dobrescu: 1
@@ -4336,7 +4473,10 @@
     tianyu-li: 1
     tom-pilar: 1
     uma-ramalingam: 1
+<<<<<<< HEAD
+=======
     varun-chari,-albin-bernhardsson: 1
+>>>>>>> upstream/main
     varun-chari,-pareena-verma: 1
     visualsilicon: 1
     ying-yu: 1
@@ -4349,6 +4489,19 @@
     percent_closed_vs_total: 0.0
 - a_date: '2024-12-30'
   content:
+<<<<<<< HEAD
+    cross-platform: 25
+    embedded-systems: 19
+    install-guides: 89
+    laptops-and-desktops: 32
+    microcontrollers: 25
+    servers-and-cloud-computing: 88
+    smartphones-and-mobile: 25
+    total: 303
+  contributions:
+    external: 43
+    internal: 353
+=======
     cross-platform: 26
     embedded-systems: 19
     install-guides: 90
@@ -4360,16 +4513,24 @@
   contributions:
     external: 45
     internal: 362
+>>>>>>> upstream/main
   github_engagement:
     num_forks: 30
     num_prs: 9
   individual_authors:
+<<<<<<< HEAD
+    alaaeddine-chakroun: 1
+=======
     alaaeddine-chakroun: 2
+>>>>>>> upstream/main
     alexandros-lamprineas: 1
     annie-tallund: 1
     arm: 3
     arnaud-de-grandmaison: 1
+<<<<<<< HEAD
+=======
     arnaud-de-grandmaison,-paul-howard,-and-pareena-verma: 1
+>>>>>>> upstream/main
     basma-el-gaabouri: 1
     ben-clark: 1
     bolt-liu: 2
@@ -4381,7 +4542,11 @@
     daniel-gubay: 1
     daniel-nguyen: 1
     david-spickett: 2
+<<<<<<< HEAD
+    dawid-borycki: 30
+=======
     dawid-borycki: 31
+>>>>>>> upstream/main
     diego-russo: 1
     diego-russo-and-leandro-nunes: 1
     elham-harirpoush: 2
@@ -4389,11 +4554,18 @@
     "fr\xE9d\xE9ric--lefred--descamps": 2
     gabriel-peterson: 5
     gayathri-narayana-yegna-narayanan: 1
+<<<<<<< HEAD
+    graham-woodward: 1
+    iago-calvo-lista,-arm: 1
+    james-whitaker,-arm: 1
+    jason-andrews: 89
+=======
     georgios-mermigkis-and-konstantinos-margaritis,-vectorcamp: 1
     graham-woodward: 1
     iago-calvo-lista,-arm: 1
     james-whitaker,-arm: 1
     jason-andrews: 91
+>>>>>>> upstream/main
     joe-stech: 1
     johanna-skinnider: 2
     jonathan-davies: 2
@@ -4401,8 +4573,12 @@
     julie-gaskin: 4
     julio-suarez: 5
     kasper-mecklenburg: 1
+<<<<<<< HEAD
+    koki-mitsunami: 1
+=======
     kieran-hejmadi: 1
     koki-mitsunami: 2
+>>>>>>> upstream/main
     konstantinos-margaritis: 7
     kristof-beyls: 1
     liliya-wu: 1
@@ -4411,6 +4587,13 @@
     nikhil-gupta,-pareena-verma,-nobel-chowdary-mandepudi,-ravi-malhotra: 1
     odin-shen: 1
     owen-wu,-arm: 2
+<<<<<<< HEAD
+    pareena-verma: 35
+    pareena-verma,-annie-tallund: 1
+    pareena-verma,-jason-andrews,-and-zach-lasiuk: 1
+    pareena-verma,-joe-stech,-adnan-alsinan: 1
+    pranay-bakre: 4
+=======
     pareena-verma: 34
     pareena-verma,-annie-tallund: 1
     pareena-verma,-jason-andrews,-and-zach-lasiuk: 1
@@ -4418,6 +4601,7 @@
     paul-howard: 1
     pranay-bakre: 4
     preema-merlin-dsouza: 1
+>>>>>>> upstream/main
     przemyslaw-wirkus: 1
     rin-dobrescu: 1
     roberto-lopez-mendez: 2
@@ -4426,7 +4610,10 @@
     tianyu-li: 1
     tom-pilar: 1
     uma-ramalingam: 1
+<<<<<<< HEAD
+=======
     varun-chari,-albin-bernhardsson: 1
+>>>>>>> upstream/main
     varun-chari,-pareena-verma: 1
     visualsilicon: 1
     ying-yu: 1
@@ -4439,6 +4626,19 @@
     percent_closed_vs_total: 0.0
 - a_date: '2025-01-06'
   content:
+<<<<<<< HEAD
+    cross-platform: 25
+    embedded-systems: 19
+    install-guides: 89
+    laptops-and-desktops: 32
+    microcontrollers: 25
+    servers-and-cloud-computing: 88
+    smartphones-and-mobile: 25
+    total: 303
+  contributions:
+    external: 43
+    internal: 353
+=======
     cross-platform: 27
     embedded-systems: 19
     install-guides: 93
@@ -4450,16 +4650,24 @@
   contributions:
     external: 45
     internal: 366
+>>>>>>> upstream/main
   github_engagement:
     num_forks: 30
     num_prs: 8
   individual_authors:
+<<<<<<< HEAD
+    alaaeddine-chakroun: 1
+=======
     alaaeddine-chakroun: 2
+>>>>>>> upstream/main
     alexandros-lamprineas: 1
     annie-tallund: 1
     arm: 3
     arnaud-de-grandmaison: 1
+<<<<<<< HEAD
+=======
     arnaud-de-grandmaison,-paul-howard,-and-pareena-verma: 1
+>>>>>>> upstream/main
     basma-el-gaabouri: 1
     ben-clark: 1
     bolt-liu: 2
@@ -4471,7 +4679,11 @@
     daniel-gubay: 1
     daniel-nguyen: 1
     david-spickett: 2
+<<<<<<< HEAD
+    dawid-borycki: 30
+=======
     dawid-borycki: 31
+>>>>>>> upstream/main
     diego-russo: 1
     diego-russo-and-leandro-nunes: 1
     elham-harirpoush: 2
@@ -4479,11 +4691,18 @@
     "fr\xE9d\xE9ric--lefred--descamps": 2
     gabriel-peterson: 5
     gayathri-narayana-yegna-narayanan: 1
+<<<<<<< HEAD
+    graham-woodward: 1
+    iago-calvo-lista,-arm: 1
+    james-whitaker,-arm: 1
+    jason-andrews: 89
+=======
     georgios-mermigkis-and-konstantinos-margaritis,-vectorcamp: 1
     graham-woodward: 1
     iago-calvo-lista,-arm: 1
     james-whitaker,-arm: 1
     jason-andrews: 94
+>>>>>>> upstream/main
     joe-stech: 1
     johanna-skinnider: 2
     jonathan-davies: 2
@@ -4491,8 +4710,12 @@
     julie-gaskin: 4
     julio-suarez: 5
     kasper-mecklenburg: 1
+<<<<<<< HEAD
+    koki-mitsunami: 1
+=======
     kieran-hejmadi: 1
     koki-mitsunami: 2
+>>>>>>> upstream/main
     konstantinos-margaritis: 7
     kristof-beyls: 1
     liliya-wu: 1
@@ -4501,6 +4724,14 @@
     nikhil-gupta,-pareena-verma,-nobel-chowdary-mandepudi,-ravi-malhotra: 1
     odin-shen: 1
     owen-wu,-arm: 2
+<<<<<<< HEAD
+    pareena-verma: 35
+    pareena-verma,-annie-tallund: 1
+    pareena-verma,-jason-andrews,-and-zach-lasiuk: 1
+    pareena-verma,-joe-stech,-adnan-alsinan: 1
+    pranay-bakre: 4
+    przemyslaw-wirkus: 1
+=======
     pareena-verma: 34
     pareena-verma,-annie-tallund: 1
     pareena-verma,-jason-andrews,-and-zach-lasiuk: 1
@@ -4509,6 +4740,7 @@
     pranay-bakre: 4
     preema-merlin-dsouza: 1
     przemyslaw-wirkus: 2
+>>>>>>> upstream/main
     rin-dobrescu: 1
     roberto-lopez-mendez: 2
     ronan-synnott: 45
@@ -4516,7 +4748,10 @@
     tianyu-li: 1
     tom-pilar: 1
     uma-ramalingam: 1
+<<<<<<< HEAD
+=======
     varun-chari,-albin-bernhardsson: 1
+>>>>>>> upstream/main
     varun-chari,-pareena-verma: 1
     visualsilicon: 1
     ying-yu: 1
@@ -4529,6 +4764,19 @@
     percent_closed_vs_total: 0.0
 - a_date: '2025-01-13'
   content:
+<<<<<<< HEAD
+    cross-platform: 25
+    embedded-systems: 19
+    install-guides: 89
+    laptops-and-desktops: 32
+    microcontrollers: 25
+    servers-and-cloud-computing: 88
+    smartphones-and-mobile: 25
+    total: 303
+  contributions:
+    external: 43
+    internal: 353
+=======
     automotive: 2
     cross-platform: 28
     embedded-and-microcontrollers: 39
@@ -4541,16 +4789,24 @@
   contributions:
     external: 45
     internal: 373
+>>>>>>> upstream/main
   github_engagement:
     num_forks: 30
     num_prs: 6
   individual_authors:
+<<<<<<< HEAD
+    alaaeddine-chakroun: 1
+=======
     alaaeddine-chakroun: 2
+>>>>>>> upstream/main
     alexandros-lamprineas: 1
     annie-tallund: 1
     arm: 3
     arnaud-de-grandmaison: 1
+<<<<<<< HEAD
+=======
     arnaud-de-grandmaison,-paul-howard,-and-pareena-verma: 1
+>>>>>>> upstream/main
     basma-el-gaabouri: 1
     ben-clark: 1
     bolt-liu: 2
@@ -4562,7 +4818,11 @@
     daniel-gubay: 1
     daniel-nguyen: 1
     david-spickett: 2
+<<<<<<< HEAD
+    dawid-borycki: 30
+=======
     dawid-borycki: 31
+>>>>>>> upstream/main
     diego-russo: 1
     diego-russo-and-leandro-nunes: 1
     elham-harirpoush: 2
@@ -4570,12 +4830,19 @@
     "fr\xE9d\xE9ric--lefred--descamps": 2
     gabriel-peterson: 5
     gayathri-narayana-yegna-narayanan: 1
+<<<<<<< HEAD
+    graham-woodward: 1
+    iago-calvo-lista,-arm: 1
+    james-whitaker,-arm: 1
+    jason-andrews: 89
+=======
     georgios-mermigkis-and-konstantinos-margaritis,-vectorcamp: 1
     graham-woodward: 1
     han-yin: 1
     iago-calvo-lista,-arm: 1
     james-whitaker,-arm: 1
     jason-andrews: 96
+>>>>>>> upstream/main
     joe-stech: 1
     johanna-skinnider: 2
     jonathan-davies: 2
@@ -4583,8 +4850,12 @@
     julie-gaskin: 4
     julio-suarez: 5
     kasper-mecklenburg: 1
+<<<<<<< HEAD
+    koki-mitsunami: 1
+=======
     kieran-hejmadi: 1
     koki-mitsunami: 2
+>>>>>>> upstream/main
     konstantinos-margaritis: 7
     kristof-beyls: 1
     liliya-wu: 1
@@ -4593,6 +4864,14 @@
     nikhil-gupta,-pareena-verma,-nobel-chowdary-mandepudi,-ravi-malhotra: 1
     odin-shen: 1
     owen-wu,-arm: 2
+<<<<<<< HEAD
+    pareena-verma: 35
+    pareena-verma,-annie-tallund: 1
+    pareena-verma,-jason-andrews,-and-zach-lasiuk: 1
+    pareena-verma,-joe-stech,-adnan-alsinan: 1
+    pranay-bakre: 4
+    przemyslaw-wirkus: 1
+=======
     pareena-verma: 34
     pareena-verma,-annie-tallund: 1
     pareena-verma,-jason-andrews,-and-zach-lasiuk: 2
@@ -4602,6 +4881,7 @@
     pranay-bakre,-masoud-koleini,-nobel-chowdary-mandepudi,-na-li: 1
     preema-merlin-dsouza: 1
     przemyslaw-wirkus: 2
+>>>>>>> upstream/main
     rin-dobrescu: 1
     roberto-lopez-mendez: 2
     ronan-synnott: 45
@@ -4609,10 +4889,15 @@
     tianyu-li: 1
     tom-pilar: 1
     uma-ramalingam: 1
+<<<<<<< HEAD
+    varun-chari,-pareena-verma: 1
+    visualsilicon: 1
+=======
     varun-chari,-albin-bernhardsson: 1
     varun-chari,-pareena-verma: 1
     visualsilicon: 1
     willen-yang: 1
+>>>>>>> upstream/main
     ying-yu: 1
     ying-yu,-arm: 1
     zach-lasiuk: 1