hue-state
Fix merge conflicts.