casas
merge solved