diff --git a/application/dashboard/views.py b/application/dashboard/views.py
index 955bbfe..fd55086 100644
--- a/application/dashboard/views.py
+++ b/application/dashboard/views.py
@@ -24,17 +24,10 @@ def dashboard():
         .limit(50)
         .all()
     )
-<<<<<<< Updated upstream
-    form = npForm()
-    return render_template(
-        "dashboard.html", plates=Plates, logs=logs, form=form
-    )
-=======
     form = npForm() 
     #LogID = LoggedItem.query.all()
     id = LoggedItem.id
     return render_template("dashboard.html", plates=Plates, logs=logs, form=form, id=id)
->>>>>>> Stashed changes
 
 
 @dash_blueprint.route("/add", methods=["GET", "POST"])