Issue #414 fixing conflicts