Tamar Braxton and K Michelle to End Feud at BET Awards