Issue #526 fixing conflicts