Correctly add extensions. Handle explicit merges correctly