distinguish between merge and update on states
cosmetic
cosmetic