Commented out conflicting bundles