start bug1 progress
bug1 resolved
start bug2 progress
Merge bug1&bug2