resolving conflicts after master merge:
duplicates of strings