resolve conflict of c-l