How did you install the update? Did you download a fresh copy of v0.15? (Not the update)
All you need to do is install it on to your desktop or whichever file you want, then click the .exe. Don't merge anything.