rexiniu004 for merging locally