footer and datasources text changes
data sources text tweaks
resolved conflict