The conflict has been a major test for Abiy, a leader who pledged to unite the myriad ethnic groups that make up Ethiopias 115 million population