Upgraded to v8.1.2 build #9852 and merge issue with info.plist

When I upgraded, I guess from v8.1.1, I was told there was a merge issue with info.plist during the process.  So I made a backup copy at that point of info.plist and continued thinking it would overwrite it or present to me a list of specific merge issues like how intellij works with subversion.  But after the upgrade was complete with no more warnings of this, I compared the backed up info.plist with the new one and they are exactly the same.

I had previously modified info.plist to use jdk1.6 with:
      <key>JVMVersion</key>
      <string>1.6*</string>

and I modified the memory limits:
      <key>VMOptions</key>
      <string>-Xms32m -Xmx448m -XX:MaxPermSize=200m -Xbootclasspath/a:../lib/boot.jar -ea</string>

it still shows a previous version:
    <key>CFBundleGetInfoString</key>
    <string>IntelliJ IDEA 8.1, build 9732. Copyright JetBrains s.r.o., (c) 2000-2009</string>
    <key>CFBundleShortVersionString</key>
    <string>8.1</string>
    <key>CFBundleVersion</key>
    <string>9732</string>

so what do I do?  What am I missing?  Things seem to work in intellij...

I'm using this on mac os x 10.5 with an intel core 2 duo cpu.