Issue #188 - fixing conflicts