fix EAV
fix merge