Fixed Canceling Name Change

The name editing still needs testing when handling conflicts