Fix encoding + merge issue