Conor McGregor seemingly ends spat with Khabib in positive tweet