diff --git a/04-Typescript/22-git/admin style/dist/style.css b/04-Typescript/22-git/admin style/dist/style.css
new file mode 100644
index 000000000..c36cc07dd
--- /dev/null
+++ b/04-Typescript/22-git/admin style/dist/style.css	
@@ -0,0 +1,5 @@
+<<<<<<< Updated upstream
+@i;
+=======
+@imp;
+>>>>>>> Stashed changes
diff --git a/04-Typescript/22-git/admin style/style.scss b/04-Typescript/22-git/admin style/style.scss
new file mode 100644
index 000000000..4c6dc06e2
--- /dev/null
+++ b/04-Typescript/22-git/admin style/style.scss	
@@ -0,0 +1 @@
+@import "../features/inventory/dist/inventory.scc"