An inconsistency Tolkien "solved" is most notably Glorfindel. The name was used twice in early drafts so he decided to merge those two persons even though they appears eras apart, and the first one had died. He did it by introducing the concept of reincarnation for the elves.