fix binary link
fix merge conflict