diff --git a/Src/Hyperion-bash-v1.0.0/bin/bash b/Src/Hyperion-bash-v1.0.0/bin/bash
index b4e7e93..e69de29 100644
--- a/Src/Hyperion-bash-v1.0.0/bin/bash
+++ b/Src/Hyperion-bash-v1.0.0/bin/bash
@@ -1,24 +0,0 @@
-local args={...}
-<<<<<<< HEAD
-local sys = require("sys")
-=======
-local os=require("os")
-local io=require("io")
-local text=""
-local blockKeyEvents=false
-io.link(io.focas)
-
-os.hookSignal("keyTyped", function(_, screen, key)
-    if blockKeyEvents then return end
-    if key == "\n" then
-        blockKeyEvents=true
-    elseif key == "\b" then
-        text=text:sub(1,#text-1)
-        io.stdout.printInline("\b")
-    else
-        text=text..key
-        io.stdout.printInline(key)
-    end
-end)
-
->>>>>>> 9b268810a7ea44e586d5faf6e2717f1d02497c03