Fixed merge error
Merge branch 'master' of https://github.com/ergodic1/QuickDialog