Issue #110 - fixing conflicts