Gitignore sass-cache
Mergeconflict