diff --git a/script.js b/script.js
index 452c0ed..96aac3c 100644
--- a/script.js
+++ b/script.js
@@ -1,3 +1,20 @@
+<<<<<<< HEAD
+const logger = () => {
+	const message = 'hi';
+	console.log(message);
+};
+
+const looper = () => {
+	const message = 'I love JS!';
+	for (let i = 0; i < 10; i++) {
+		console.log(message);
+	}
+};
+
+const greet = (name) => {
+	const greeting = `Hello ${name}!`;
+	console.log(greeting);
+=======
 var logger = function() {
   var message = 'hi';
   console.log(message);
@@ -13,10 +30,12 @@ var looper = function() {
 var greet = function(name) {
   var greeting = 'Hello ' + name + '!';
   console.log(greeting);
+>>>>>>> d3daaa72bdd4e2667a5b7436ec9d21d4a41f2e0f
 };
 
-var yourName = 'put your name in here';
+const yourName = 'Allan';
 
 logger();
 looper();
 greet(yourName);
+