Add XiaoBun's information.
Fix CONFLICT from PuChin.