diff --git a/content/en/stories/_index.md b/content/en/stories/_index.md
index 517e414a39..792b66e233 100644
--- a/content/en/stories/_index.md
+++ b/content/en/stories/_index.md
@@ -28,6 +28,12 @@ aliases:
       {{< /company >}}
       {{< company name="Alliander" image="/images/logos/alliander.png" video="https://youtu.be/Q6yCZI4f2bo?t=1131" >}}
       {{< /company >}}
+<<<<<<< Updated upstream
+      {{< company name="Amadeus IT Group" image="/images/logos/amadeus.png" video="https://www.youtube.com/watch?v=_lmAiOoQlhA&list=PLCH-i0B0otNQkjMyRiIgnDBVvLHW1_Gab&index=15" >}}
+=======
+      {{< company name="Amadeus IT Group" image="/images/logos/amadeus.jpeg" video="https://www.youtube.com/watch?v=_lmAiOoQlhA&list=PLCH-i0B0otNQkjMyRiIgnDBVvLHW1_Gab&index=15" >}}
+>>>>>>> Stashed changes
+      {{< /company >}}
       {{< company name="American Airlines" image="/images/logos/americanairlines.png" article="https://tech.aa.com/2020-10-30-innersource/" >}}
       {{< /company >}}
       {{< company name="Anyshore" image="/images/logos/Anyshore.png" article="https://www.linkedin.com/pulse/anyshore-innersource-journey-lisalee-tunde-farrell/?trackingId=2whtvdgFQga8y6CG8N9TOg%3D%3D" >}}
diff --git a/static/images/logos/amadeus.jpeg b/static/images/logos/amadeus.jpeg
deleted file mode 100644
index ace2db8e4f..0000000000
Binary files a/static/images/logos/amadeus.jpeg and /dev/null differ
diff --git a/static/images/logos/amadeus.png b/static/images/logos/amadeus.png
new file mode 100644
index 0000000000..77088a416d
Binary files /dev/null and b/static/images/logos/amadeus.png differ