fsnotify sass
Fix conflict