Resolve merge conflict
Add Jinja bundle