remove sensitive short cut
merge