Fix: remove diff only if it exists