diff --git a/.gitignore b/.gitignore
index bf45bb9..494b38b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,65 +1,2 @@
-<<<<<<< HEAD
 paddockpass
 test.db
-=======
-
-# Created by https://www.gitignore.io/api/go,vim,visualstudiocode
-# Edit at https://www.gitignore.io/?templates=go,vim,visualstudiocode
-
-### Go ###
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
-
-### Go Patch ###
-/vendor/
-/Godeps/
-
-### Vim ###
-# Swap
-[._]*.s[a-v][a-z]
-[._]*.sw[a-p]
-[._]s[a-rt-v][a-z]
-[._]ss[a-gi-z]
-[._]sw[a-p]
-
-# Session
-Session.vim
-Sessionx.vim
-
-# Temporary
-.netrwhist
-*~
-# Auto-generated tag files
-tags
-# Persistent undo
-[._]*.un~
-
-### VisualStudioCode ###
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-### VisualStudioCode Patch ###
-# Ignore all local history of files
-.history
-
-# End of https://www.gitignore.io/api/go,vim,visualstudiocode
-
-*.db
-paddockpass
->>>>>>> 3428377... Adding better gitignore