Issue #65 Conflict resolver change