fix message error and bucket with underline
Fix conflict item
Fix key with ' to scape this char