Fix merging artifact