Issue #201 resolve conflict