Is the Oasis feud finally resolved?