merge conflicts by replacing with new version
Resolve conflicts
readd files.
Import current binutils