Ok this should have successfully fix the merge issues with the API