cambio de correo a etts@etelix.com
conflicts resolved