Fix merging problem