update
update for save locale in app directory
fix conflicts
update