first part
fix merge