Fixed merging...