add the missing 'handle conflict' in merge section
Merge branch 'bug0-1' into develop