ds store
fix conflicts for html/css