merge text differences

2021