finish V0.1 version
resolve confict