diff --git a/src/views/nota-pedido.html b/src/views/nota-pedido.html
index 8af772b..1e2f81f 100644
--- a/src/views/nota-pedido.html
+++ b/src/views/nota-pedido.html
@@ -421,14 +421,10 @@
                                             style="height: auto; line-height: 1.1em"
                                         >
                                     </div>
-<<<<<<< HEAD
                                     <div class="col px-1 text-right">
-                                        <span ng-bind="articuloACargar.precio | currency: notaPedido.moneda.simbolo : 4"></span>
-=======
-                                    <div class="col-3 px-1 text-right">
                                         <span ng-bind="articuloACargar.precio |
-                                            currency: notaPedido.moneda.SIMBOLO : 4"></span>
->>>>>>> master
+                                            currency: notaPedido.moneda.SIMBOLO : 4"
+                                        ></span>
                                     </div>
                                     <div class="col px-1 text-right">
                                         <span