Deleting style.css for fixing merge conflicts