merging strings from another branch