delete and merge fix