resolve conflict 'md'