Remove scaffolds.css file which came due merge conflict