As usual while waiting for the next release - don't forget to check the nightly builds in the forum.
Should be fixed in svn.
What conflicts?