flash: it should not hang
Merge remote-tracking branch 'origin/master'
fix merge conflict