Resolve encoding conflict