Before revision: "Frenemy" (also spelled "frienemy") is an oxymoron and a portmanteau of "friend" and "enemy" that refers to "a person with whom one is friendly, despite a fundamental dislike or rivalry " or "a person who combines the characteristics of a friend and an enemy".
After revision: "Frenemy" (also spelled "frienemy") is an oxymoron and a portmanteau of "friend" and "enemy" that refers to "a person with whom one is friendly, despite a fundamental dislike orrivalry " or "a person who combines the characteristics of a friend and an enemy".