Issue #160 - Fix conflict