merged and updated tokens issue