fix merge miss
fix configure files