updates for API coala
Conflict fix