[#56262564] fix conflict