Issue #421 conflicts