fix warning on const conversion
fix merge conflict