fix merge,fix first error wait time is zero bug
improve message load and error handle