Controversial Clicky: re-merge SN & SNP