need to commit changes in xcuserstate?
fixed conflict in xcuserstate
added glow to empty cells