Fixing merging problems