export interface
resolve conflict