Replace API with CI 2.1.4
Fix Conflict