Naomi has been involved in a heated feud for the past few months. She has now teased that this feud may be over.