diff --git a/app/overview/controllers/log-controller.js b/app/overview/controllers/log-controller.js
index b952893..3dfd2e4 100644
--- a/app/overview/controllers/log-controller.js
+++ b/app/overview/controllers/log-controller.js
@@ -19,8 +19,11 @@
             'dataService',
             function($scope, $window, APIUtils, dataService, userModel){
                 $scope.dataService = dataService;
+<<<<<<< HEAD
 
                 $scope.dropdown_selected = false;
+=======
+>>>>>>> 4c1a3dd... Major update to code structure
             }
         ]
     );