removes dead file
moves all the styles and resolves conflicts in doing so