delete indentation
merge conflict in min.css
finish part added