merge conflicts by replacing with new version
Resolve conflicts
add missing files
Import current binutils