Issue #203 fixing conflicts 2