fix merge
CSS properties
add css features