There were merges in configure.in and some Makefile.in. None had any conflicts. I spot verified the Makefile.in changes and confirmed that the changes did not touch any DIRS* variables.