Merge "Fix how we pick incompatibilities.txt"