Fix user bundle merge