CConflict resolved.