Issue #363 - Fix Conflicts