Issue #325 - Fixing conflicts