RICOTTA-101 update token no CONFLICT