fix CSS3 svg
fix merge conflict