diff --git a/cmd/server/main.go b/cmd/server/main.go
index 7b653c4..aca4ff3 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -33,10 +33,7 @@ func main() {
 		&user.PasswordReset{},
 		&user.Session{},
 		&equipment.Equipment{},
-<<<<<<< HEAD
-=======
 		&workout.Workout{},
->>>>>>> 64e8d77 (add routes back)
 	); err != nil {
 		log.Fatalf("Failed to migrate database: %v", err)
 	}