Issue #174 - Fix conflicts II