bad local edits
merged with finished versions