included category-bundle
solved merge conflicts