#88707: Fixes to badly solved conflict.