Cleaned up the duplicate fix, don't actually push an undo until you're thinking about doing an atomic move