remove conflict css
Merge pull request #11 from fireweb/master

fixed one conflict problem