Add SASS file.
Fix merging conflict.