Collection pagination and response format
Resolving conflicts