add new binary files
add linkage
fix silly conflict