Fix merging.