merge
merge
fixed shortcuts