fixes settings.xml merge