locale method changed
merge