Resolve merge conflict on anaconda3

packages/anaconda3.xml

@@ -6,10 +6,10 @@
 
 <!-- installer puts uninstall info in HKCU rather than HKLM, which wpkg does not search. Thus, provide our own registry key -->
 
-  <check type='registry' condition='equals' path='HKLM\software\ucam_wpkg.cam.ac.uk\WPKG\anaconda3' value="%version%"/>
+  <check type='registry' condition='equals' path='HKLM\software\ucam_wpkg.cam.ac.uk\anaconda3' value="%version%"/>
 
   <install cmd='%WPKGSOFTWARE%\anaconda\Anaconda3-%version%-Windows-x86_64.exe /S /InstallationType=AllUsers /D=c:\anaconda3' />
-  <install cmd='reg add HKLM\software\ucam_wpkg.cam.ac.uk\WPKG /t reg_sz /v anaconda3 /d %version% /f'/>
+  <install cmd='reg add HKLM\software\ucam_wpkg.cam.ac.uk /t reg_sz /v anaconda3 /d %version% /f'/>
 
   <upgrade include="remove" />
   <upgrade include="install" />
@@ -18,7 +18,7 @@
   <remove cmd='c:\anaconda3\uninstall-anaconda3.exe /S' />
   <remove cmd='cmd /c %WPKGSOFTWARE%\wpkg\tools\waitforprocess.cmd Un_A.exe' />
 
-  <remove cmd='reg delete HKLM\software\ucam_wpkg.cam.ac.uk\WPKG /v anaconda3 /f'/>
+  <remove cmd='reg delete HKLM\software\ucam_wpkg.cam.ac.uk /v anaconda3 /f'/>
 
   </package>