merge with fusijie master