export function resolveConflicts(entries: any, cg: any): Pick[];