resolved merge
removed  charset dependency