conflict configure fix