interfaz ingresar
conflictsolved