FIFA and CAF resolve Ethiopian soccer sqabble