fixing conflicts config.xml