Fix incomplete conflict resolution in: 8cad2dda4afbc970a538b1b038cce41e82db495b