Fixing unit merge in castle