issue #5685: fix conflicts