Fix merging