diff --git a/.gitignore b/.gitignore
index 3321148..ec8b708 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,10 +15,14 @@ public/assets/css/*
!public/assets/css/dash
!public/assets/scripts
public/assets/scripts/*
+<<<<<<< HEAD
!public/assets/scripts/Start.js
/public/assets/images/global/rikc-logo.svg
+=======
+!public/assets/scripts/dash.js
+>>>>>>> develop
!public/assets/images
public/assets/images/*
!public/assets/images/global/
diff --git a/brain/views/dash/_frame.twig b/brain/views/dash/_frame.twig
index 7903787..056578b 100644
--- a/brain/views/dash/_frame.twig
+++ b/brain/views/dash/_frame.twig
@@ -43,6 +43,6 @@
{% endapply %}
-
+