Fixing merging