Issue #223 fix conflicts