fixing conflict config.xml