fix case convention
fix merge, properties
merge merge