luna changed at home
luna conflict resolved