strings.xml reconciliation