diff --git a/Cargo.lock b/Cargo.lock
index 00d0846..aac4a83 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2195,11 +2195,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
 
 [[package]]
 name = "reminder-rs"
-<<<<<<< HEAD
 version = "1.6.50"
-=======
-version = "1.6.48"
->>>>>>> 97f186d (Add metrics)
 dependencies = [
  "base64 0.21.5",
  "chrono",
@@ -2227,11 +2223,7 @@ dependencies = [
 
 [[package]]
 name = "reminder_web"
-<<<<<<< HEAD
 version = "0.1.4"
-=======
-version = "0.1.3"
->>>>>>> 97f186d (Add metrics)
 dependencies = [
  "base64 0.13.1",
  "chrono",
diff --git a/web/src/routes/dashboard/mod.rs b/web/src/routes/dashboard/mod.rs
index 2a51e01..7bc9243 100644
--- a/web/src/routes/dashboard/mod.rs
+++ b/web/src/routes/dashboard/mod.rs
@@ -8,7 +8,6 @@ use rocket::{
     response::Redirect,
     serde::json::json,
 };
-use rocket_dyn_templates::Template;
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use serenity::{
     client::Context,