<human>: Question: Who prompted Eritrea to be federated with Ethiopia in 1950?

Is Following the adoption of UN Resolution 390A(V) in December 1950, Eritrea was federated with Ethiopia under the prompting of the United States. a good answer to this question?

OPTIONS:
- yes
- no
<bot>: yes