Properly merge head.flags and OS/2.fsType

Also install the merge script.