match array contents, and fix merge