commit for local
Commit for shop setting fix and setting back button fix