added tallier keys
merging
fixing conflicts