Updated Strings to solve merge issue