restore the version damaged by merges