rename fields
fix merge