added user_id merge to quick pet