fix confliction of _config.xml after merge