I noticed I was running 1.5.1 and 1.5.4 was out; The release notes indicate some nice merge related fixes(performance, correctness with mergeinfo) among others, so it's probably worth upgrading if you haven't.