diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html
index b9e4819..abd3348 100644
--- a/app/server-health/controllers/sensors-overview-controller.html
+++ b/app/server-health/controllers/sensors-overview-controller.html
@@ -43,7 +43,6 @@
 			</div>
 		</div>
 		<!-- sensor -->
-<<<<<<< HEAD
 		<div class="sensor__readings-row" ng-repeat="sensor in (filteredSensorData = data|filter:filterBySeverity|filter:filterBySearchTerms|orderBy:'-order')">
 			<p class="inline sensor__title"><span class="icon" ng-class="{'icon__critical': sensor.status == 'critical', 'icon__warning': sensor.status == 'warning', 'icon__normal': sensor.status == 'normal'}" aria-label="sensor.status" ></span>{{sensor.title}}</p>
 			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>{{sensor.CriticalLow}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
@@ -52,101 +51,5 @@
 			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>{{sensor.WarningHigh}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
 			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>{{sensor.CriticalHigh}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">&deg;</span></p>
 		</div>
-=======
-		<div class="sensor__readings-row" >
-			<p class="inline sensor__title"><span class="icon icon__critical" aria-label="critical"></span>Temperature 5</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>32<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>45<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading sensor__current sensor__critical "><span class="sensor__label">Current</span>124<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>105<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>120<span class="content-label">C&deg;</span></p>
-		</div>
-		<!-- sensor -->
-		<div class="sensor__readings-row" >
-			<p class="inline sensor__title"><span class="icon icon__critical" aria-label="critical"></span>Fan 3</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>100<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>400<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading sensor__current sensor__critical"><span class="sensor__label">Current</span>90<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>2000<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>2500<span class="content-label">rpm</span></p>
-		</div>
-		<!-- sensor -->
-		<div class="sensor__readings-row" >
-			<p class="inline sensor__title"><span class="icon icon__warning" aria-label="warning"></span>Fan 5</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>100<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>400<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading sensor__current sensor__warn"><span class="sensor__label">Current</span>90<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>2000<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>2500<span class="content-label">rpm</span></p>
-		</div>
-		<!-- sensor -->
-		<div class="sensor__readings-row" >
-			<p class="inline sensor__title">Temperature 1</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>32<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>45<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading sensor__current"><span class="sensor__label">Current</span>78<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>105<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>120<span class="content-label">C&deg;</span></p>
-		</div>
-		<!-- sensor -->
-		<div class="sensor__readings-row" >
-			<p class="inline sensor__title">Temperature 2</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>32<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>--</p>
-			<p class="inline sensor__reading sensor__current"><span class="sensor__label">Current</span>81<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>--</p>
-			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>120<span class="content-label">C&deg;</span></p>
-		</div>
-		<!-- sensor -->
-		<div class="sensor__readings-row" >
-			<p class="inline sensor__title">Temperature 3</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>32<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>45<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading sensor__current"><span class="sensor__label">Current</span>98<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>105<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>120<span class="content-label">C&deg;</span></p>
-		</div>
-		<!-- sensor -->
-		<div class="sensor__readings-row" >
-			<p class="inline sensor__title">Temperature 4</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>32<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>50<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading sensor__current"><span class="sensor__label">Current</span>79<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>95<span class="content-label">C&deg;</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>110<span class="content-label">C&deg;</span></p>
-		</div>
-		<!-- sensor -->
-		<div class="sensor__readings-row" >
-			<p class="inline sensor__title"></span>Fan 1</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>100<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>400<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading sensor__current"><span class="sensor__label">Current</span>130<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>2000<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>2500<span class="content-label">rpm</span></p>
-		</div>
-		<!-- sensor -->
-		<div class="sensor__readings-row" >
-			<p class="inline sensor__title"></span>Fan 2</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>100<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>--</p>
-			<p class="inline sensor__reading sensor__current"><span class="sensor__label">Current</span>1300<span class="content-label">rpm</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>--</p>
-			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>2500<span class="content-label">rpm</span></p>
-		</div>
-		<!-- sensor -->
-		<div class="sensor__readings-row" >
-			<p class="inline sensor__title">Altitude</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low critical</span>--</p>
-			<p class="inline sensor__reading"><span class="sensor__label">Low warning</span>--</p>
-			<p class="inline sensor__reading sensor__current"><span class="sensor__label">Current</span>300<span class="content-label">M</span></p>
-			<p class="inline sensor__reading"><span class="sensor__label">High warning</span>--</p>
-			<p class="inline sensor__reading"><span class="sensor__label">High critical</span>--</p>
-		</div>
-		<!--<a ng-repeat="sensor in (filteredSensorData = data.sensors|filter:filterBySeverity|filter:filterBySearchTerms)" class="sensor__group" href="#/server-health/sensors/{{sensor.type}}">-->
-			<!--<span class="inline priority-tag-circ" ng-class="{'high-priority': sensor.status == 'critical', 'medium-priority': sensor.status == 'warning', 'low-priority': sensor.status == 'normal'}" aria-label="High Priority"></span>{{sensor.title}} ({{sensor.data.length}})-->
-			<!--<p class="inline float-right" ng-class="{'sensor__critical-label': sensor.status == 'critical', 'sensor__warning-label': sensor.status == 'warning', 'sensor__normal-label': sensor.status == 'normal'}">{{sensor.status}}</p>-->
-		<!--</a>-->
-
->>>>>>> work on sensors page. minor bug fixes. removed thresholds scss file. no longer needed due to design changes.
 	</section>
 </div>