Remove conf/conf.xml from .gitignore.