modified error info
merge dev modified info