dianjin  callback
merge