diff --git a/README.md b/README.md
index 3b5aecb..8ca0ad6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 # trainee-release-with-git
 
 This is the trainee course material for the session "Release with Git" which
@@ -40,3 +41,15 @@ begin!
 * [Semantic Release: Release Workflows](https://semantic-release.gitbook.io/semantic-release/recipes/release-workflow)
 * [Git Rebase: Git In Practice](https://www.thinktecture.com/en/tools/demystifying-git-rebase)
 * [Video: VSCode GitLens Interactive Rebase UI](https://www.youtube.com/watch?v=P5p71fguFNI)
+=======
+# Hello world
+
+NodeJS hello world
+
+## How to run
+
+```
+node index.js
+```
+
+>>>>>>> 4f0573d (docs: add readme and comments)
diff --git a/index.js b/index.js
index 635625a..ba99050 100644
--- a/index.js
+++ b/index.js
@@ -1 +1,3 @@
-console.log("Hello world!");
\ No newline at end of file
+// Prints hello world and current time to the user
+console.log("Hello world!");
+console.log(new Date());