diff --git a/src/index.ts b/src/index.ts
index eb6f468..4e84a0f 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,7 +1,6 @@
 import { User } from "./types";
 
 const text = "This is Michael's Answer";
-<<<<<<< HEAD
 fdsafd
 AudioBufferSourceNodedsaf
 DataTransferdsaf
@@ -10,18 +9,6 @@ FormDataasf
 DataTransferdsa
 FileSystemDirectoryEntryafd
 sa
-=======
-
-
-
-
-
-
-
-
-
-
->>>>>>> master
 function getFromDb(): User[] {
   return [{
     name: "kfir",