settings/shortcuts view
merging changes