fix merge error
fix pkgconfig file