Issue #174 - Fix Conflict