zmiana inna
merged