clean main xml
fix config.xml
merge conflict