switch to jade
fix conflicts