Fixup: resolve merge conflict with sass