commit
all fixed except edit duplicates instead of replacing.