diff --git a/ws_sr_padron.py b/ws_sr_padron.py
index ef222f1ed..9903e20e7 100644
--- a/ws_sr_padron.py
+++ b/ws_sr_padron.py
@@ -23,8 +23,8 @@
 from builtins import next
 
 __author__ = "Mariano Reingart <reingart@gmail.com>"
-__copyright__ = "Copyright (C) 2017-2022 Mariano Reingart"
-__license__ = "GPL 3.0"
+__copyright__ = "Copyright (C) 2017-2023 Mariano Reingart"
+__license__ = "LGPL-3.0-or-later"
 __version__ = "3.05a"
 
 import csv
@@ -55,7 +55,6 @@
 
 
 class WSSrPadronA4(BaseWS):
-<<<<<<< HEAD
     "Interfaz para el WebService de Consulta Padrón Contribuyentes Alcance 4"
     _public_methods_ = [
         "Consultar",