Fixed conflicts with bundle.