Fix merging regression