small merge bug fix
default cancelable dialog