Autotools

Fixed merge conflicts