2 of 7 added 332 characters in body

When class and background skills overlap, you can just pick whatever; from the PHB, pg. 126:

If a character would gain the same proficiency from two different sources, he or she can choose a different proficiency of the same kind (skill or tool) instead.

This quote is in the context of backgrounds, so this doesn't really work in this context. As suggested by @Theik, if you follow that line of reasoning, you can do weird stuff like pick perception from your class if you're an elf, and then because you now have perception from two different sources decide to pick any other skill, instead of being able to pick from any other skill from your class list. The backgrounds are flexible, the class skills are not.

However, since this is still during level 1 character creation, just don't pick History from class, then there are no overlaps; otherwise this will essentially be a wasted skill (as you suspected, hence your "oops" in your question).