conflict resolution

Could not connect to the API.