fix unmerged src/configure