modified name
solve confilcts
fix analysis bugs