You get an API, and YOU get an API!
Fix merge conflict