merge in squiz