*9024* Fix bad merge