Correction of initial merge conflict, ./configure