Issue #363 - Fix conflicts