merge conflicts
removes duplicate css file and index.html
scaffold
merge conflict