diff --git a/README.md b/README.md
index a4f27a3..3f294ac 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,11 @@ shopify theme init [ NAME OF YOUR THEME ] --clone-url https://github.com/polidar
 If you don't have Shopify CLI installed to your computer, navigate to the [installation page of Shopify CLI](https://shopify.dev/themes/tools/cli/installation).
 
 ## Not a student
+<<<<<<< Updated upstream
 
 If you're not a student, you can still use this repository to start a new Shopify theme project. However, any issues that you will encounter throughout your development will not be supported as the instructor will only answer questions through the course's QnA page.
 
+=======
+
+If you're not a student, you can still use this repository to start a new Shopify theme project. However, any issues that you will encounter throughout your development will not be supported as the instructor will only answer questions through the course's QnA page.
+>>>>>>> Stashed changes
diff --git a/assets/application.js b/assets/application.js
index bc084d6..e69de29 100644
--- a/assets/application.js
+++ b/assets/application.js
@@ -1 +0,0 @@
-// Put your application javascript here
diff --git a/tailwind.config.js b/tailwind.config.js
index 39824a4..1bf9d4b 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -13,3 +13,5 @@ module.exports = {
   plugins: [],
 }
 
+
+