This might work - but make a backup after the first point :

- stop BOINC (important!!!)
- backup - I don\'t think it\'s needed but who knows
- find client_state.xml in your BOINC directory and open it with a text editor (vim or notepad or so)
- there should be a line that says <p_vendor>AuthenticAMD</p_vendor> somewhere within the <host_info> section
- remove the vendor string so it looks like <p_vendor></p_vendor> (your old host entry didn\'t have a vendor string)
- restart BOINC and contact the server (update)

now the merge should be possible.