fix python2 linking, remove python3
fix merge