worked out a bug
problems with sass cache
rebase issues