Remove pedido
Merge branch