diff --git a/app/views/templates/device.phtml b/app/views/templates/device.phtml
index 28b18e2..367f930 100644
--- a/app/views/templates/device.phtml
+++ b/app/views/templates/device.phtml
@@ -1,9 +1,5 @@
 <!DOCTYPE html>
 <html lang="en">
-<<<<<<< HEAD
-=======
-
->>>>>>> 5cb6f0b... Some Fixes
 <head>
 	<?php
 	$partial = new Partial('head');
