[issue #86] [MC] solving conflicts