built burn mixin, edited manifests
fixing merge conflict
fixing merge conflicts