diff --git a/flake.lock b/flake.lock
index 01e0e55..a4b407b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,19 +7,11 @@
         ]
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1699548976,
-        "narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "6849911446e18e520970cc6b7a691e64ee90d649",
-=======
         "lastModified": 1702956644,
         "narHash": "sha256-6XxZSkhb/OkxIx705RHTTLYZ2qemmEC7tODD8f21gKw=",
         "owner": "ipetkov",
         "repo": "crane",
         "rev": "537ebb11db883f9076e37d83e3c7ee69a4abb48c",
->>>>>>> 881c599 (change to axum-oidc)
         "type": "github"
       },
       "original": {
@@ -48,19 +40,11 @@
     },
     "nixpkgs": {
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1699099776,
-        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
-=======
         "lastModified": 1702830618,
         "narHash": "sha256-lvhwIvRwhOLgzbRuYkqHy4M5cQHYs4ktL6/hyuBS6II=",
         "owner": "NixOS",
         "repo": "nixpkgs",
         "rev": "91a00709aebb3602f172a0bf47ba1ef013e34835",
->>>>>>> 881c599 (change to axum-oidc)
         "type": "github"
       },
       "original": {
@@ -88,19 +72,11 @@
         ]
       },
       "locked": {
-<<<<<<< HEAD
-        "lastModified": 1699582387,
-        "narHash": "sha256-sPmUXPDl+cEi+zFtM5lnAs7dWOdRn0ptZ4a/qHwvNDk=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "41f7b0618052430d3a050e8f937030d00a2fcced",
-=======
         "lastModified": 1702952173,
         "narHash": "sha256-24kUnTZgXP5B/fs1/f61tJuHyFrJ8824rn1B/0hL1og=",
         "owner": "oxalica",
         "repo": "rust-overlay",
         "rev": "20fd62b0891707a1db8117d09fc3e65a1cd0f6d7",
->>>>>>> 881c599 (change to axum-oidc)
         "type": "github"
       },
       "original": {