*8876* Fix merge bumpf