typo
disable panic button
merge fix