Why did you make the change that hero and castle armies are only merged when the castle is owned by the AI in r1059?  It is supposed to happen with all heroes.

Cheers,
Josh