diff --git a/resources/views/admin/jexactyl/store.blade.php b/resources/views/admin/jexactyl/store.blade.php
index e37e155a4..c6568fa9d 100644
--- a/resources/views/admin/jexactyl/store.blade.php
+++ b/resources/views/admin/jexactyl/store.blade.php
@@ -61,19 +61,6 @@
                                 </div>
                             </div>
                             <div class="form-group col-md-4">
-<<<<<<< Updated upstream
-                                <label class="control-label">Habilitar Mercado Pago</label>
-                                <div>
-                                    <select name="store:mpago:enabled" class="form-control">
-                                        <option @if ($mpago_enabled == 'false') selected @endif value="false">Desabilitado</option>
-                                        <option @if ($mpago_enabled == 'true') selected @endif value="true">Habilitado</option>
-                                    </select>
-                                    <p class="text-muted"><small>Determina se os usuários poderão comprar créditos com Mercado Pago.</small></p>
-                                </div>
-                            </div>
-                            <div class="form-group col-md-4">
-=======
->>>>>>> Stashed changes
                                 <label class="control-label" for="store:currency">Nome da moeda</label>
                                 <select name="store:currency" id="store:currency" class="form-control">
                                     @foreach ($currencies as $currency)