[Issue #186][MC] fixed merge conflict