Reverting mergeChanges to NO Issue #225