Init Bundler
Resolve conflict