Fixed merging.