diff --git a/circle/dashboard/static/dashboard/dashboard.css b/circle/dashboard/static/dashboard/dashboard.css
index 5638eda..1fd864a 100644
--- a/circle/dashboard/static/dashboard/dashboard.css
+++ b/circle/dashboard/static/dashboard/dashboard.css
@@ -332,8 +332,6 @@ a.hover-black {
 
 }
 
-
-<<<<<<< HEAD
 .notification-messages {
   padding: 10px 8px;
   width: 350px;
diff --git a/circle/dashboard/static/dashboard/vm-details.js b/circle/dashboard/static/dashboard/vm-details.js
index 9a500fd..2760856 100644
--- a/circle/dashboard/static/dashboard/vm-details.js
+++ b/circle/dashboard/static/dashboard/vm-details.js
@@ -131,7 +131,11 @@ $(function() {
           location.reload();
         },
         error: function(xhr, textStatus, error) {
-
+          if (xhr.status == 500) {
+            addMessage("Internal Server Error", "danger");
+          } else {
+            addMessage(xhr.status + " Unknown Error", "danger");
+          }
         }
       });
     } else {