The merge can now take the 0 or 3 files