fix merge test/function override and array