Issue #153: Fix conflicts.