Shanghai firms merge to form enlarged Boss & Young