Add encoder "charset" element

Re-format the file after merging please