1. change the error effect from merge error....
2. fix some typo error