- sigh, try again to fix merge of maintenance_sources