Fix merge problem with flash verify for F4