gitignore merge conflict resolved
gitignore conflict resolved
Ignoring sass cache and adding feature update