Updated .gitignore
Autotools
Fixed conflict