diff --git a/01_Day_Introduction/01_day_starter/datatypes.js b/01_Day_Introduction/01_day_starter/datatypes.js
index 577754b..88fd023 100644
--- a/01_Day_Introduction/01_day_starter/datatypes.js
+++ b/01_Day_Introduction/01_day_starter/datatypes.js
@@ -15,3 +15,4 @@ function logType(variable){console.log(typeof variable)}
 console.log(`${firstName} is ${myAge} years old`)
 console.log(`${yourName} is ${yourAge} years old, what an oldie!`)
 console.log("git test")
+console.log("git test three with conflict")