The API is now correctly setup
Resolved merge conflict