diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..bdc9f0a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+gitignore/
diff --git a/dev/weekend.md b/dev/weekend.md
index 9c77a3b..82ebd02 100644
--- a/dev/weekend.md
+++ b/dev/weekend.md
@@ -14,17 +14,6 @@ print_background: false
# Isle of Wight Triumph weekend

-<<<<<<< HEAD
Thanks you to all who came along to the triumph weekend this year and helped us complete a smooth transition by being so accommodating. We hope you all had a good time and will be happy to know that planing for next year has already started.
-{width="50%"}
+{width="50%"}
Looking forward to seeing you next year Friday 2^nd^ May to Monday 5^th^ May 2025.
-=======
-This year the Isle of Wight Triumph Weekend will again be held over the first [May Bank Holiday](/iow.ics) (Friday 3^rd^ May to Monday 6^th^ May 2024) at the [Waverley Park Holiday Centre](https://www.waverleypark.co.uk/), in East Cowes.
-
-Please complete your Entertainment Ticket Order Form [here](https://forms.office.com/r/VHNhMULfGZ?origin=lprLink).
-
-Here are the "**What Three Words**" location;
-[///entire.hires.tensions](https://w3w.co/entire.hires.tensions)
-
-
->>>>>>> parent of af385ce (remove form link)
diff --git a/sitemap.xml b/sitemap.xml
index c26c41b..cceb1a3 100644
--- a/sitemap.xml
+++ b/sitemap.xml
@@ -6,9 +6,9 @@