diff --git a/Gemfile b/Gemfile
index f01211b..e282cc7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,8 @@ source "https://rubygems.org"
 #
 # This will help ensure the proper Jekyll version is running.
 # Happy Jekylling!
-gem "jekyll", "~> 4.3.3"
+#gem "jekyll", "~> 4.3.3"
+gem "github-pages", "~> 231", group: :jekyll_plugins
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
 gem "minima", "~> 2.5"
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
diff --git a/_posts/2024-07-01-welcome-to-jekyll.markdown b/_posts/2024-07-01-welcome-to-jekyll.markdown
index 77db1f7..43c56d0 100644
--- a/_posts/2024-07-01-welcome-to-jekyll.markdown
+++ b/_posts/2024-07-01-welcome-to-jekyll.markdown
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ---
 layout: post
 title:  "Welcome to Jekyll!"
@@ -27,3 +28,34 @@ Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most ou
 [jekyll-docs]: https://jekyllrb.com/docs/home
 [jekyll-gh]:   https://github.com/jekyll/jekyll
 [jekyll-talk]: https://talk.jekyllrb.com/
+=======
+---
+layout: post
+title:  "Welcome to Jekyll!"
+date:   2024-07-01 12:19:36 +0200
+categories: jekyll update
+---
+You’ll find this post in your `_posts` directory. Go ahead and edit it and re-build the site to see your changes. You can rebuild the site in many different ways, but the most common way is to run `jekyll serve`, which launches a web server and auto-regenerates your site when a file is updated.
+
+Jekyll requires blog post files to be named according to the following format:
+
+`YEAR-MONTH-DAY-title.MARKUP`
+
+Where `YEAR` is a four-digit number, `MONTH` and `DAY` are both two-digit numbers, and `MARKUP` is the file extension representing the format used in the file. After that, include the necessary front matter. Take a look at the source for this post to get an idea about how it works.
+
+Jekyll also offers powerful support for code snippets:
+
+{% highlight ruby %}
+def print_hi(name)
+  puts "Hi, #{name}"
+end
+print_hi('Tom')
+#=> prints 'Hi, Tom' to STDOUT.
+{% endhighlight %}
+
+Check out the [Jekyll docs][jekyll-docs] for more info on how to get the most out of Jekyll. File all bugs/feature requests at [Jekyll’s GitHub repo][jekyll-gh]. If you have questions, you can ask them on [Jekyll Talk][jekyll-talk].
+
+[jekyll-docs]: https://jekyllrb.com/docs/home
+[jekyll-gh]:   https://github.com/jekyll/jekyll
+[jekyll-talk]: https://talk.jekyllrb.com/
+>>>>>>> f477aae2909248464a80bc7dc06c2cf0c6f5a6ab