bundled
bundle installed again
conflicts merge