stop complaining about merge conflicts

Arrays are merged as before. Conflicting scalars are resolved
by allowing the *including* file to override.