fixup boost filesystem merge