fix configure error caused by merge