Run autogen.sh to pickup changes and resolve conflicts.