update jade; fix bug for mixin only files
fix conflicts