diff --git a/index.php b/index.php
index 19ad215..d8d6ead 100644
--- a/index.php
+++ b/index.php
@@ -186,13 +186,8 @@ legend.legend-area {
 
 </style>
 </head>
-<<<<<<< HEAD
-<body  >
-<?php if($embebido ==1) {
-=======
 <body onload="revisarSession()";  >
 <?php if($embebido ==1) { 
->>>>>>> 3373ee1dd17019a91f63696fdfc00277dd6ad88a
 if($form!=''){	 echo formulario_embebido($form,$opciones);}
 elseif($identificador !='') { echo mostrar_identificador($identificador,$id);}
 //elseif($_REQUEST['psi'] !='') { include("psi.php") ; echo $aviso;}
@@ -316,9 +311,6 @@ $(document).ready(function() {
   $('.wysiwyg_auto').summernote({dialogsInBody: true});
 });
 
-<<<<<<< HEAD
-    </script>
-=======
     </script> 
     <?php if(isset($_SESSION['id'])){ echo "
     <form name='form_session' class='navbar-form navbar-left'> 
@@ -327,6 +319,5 @@ $(document).ready(function() {
 						<span class='input-group-addon'><a href='#' onclick=\"location.reload();\" title='Renovar'>Reload</a></span>
 					</div>
 				</form> ";  } ?>
->>>>>>> 3373ee1dd17019a91f63696fdfc00277dd6ad88a
 </body>
 </html>
