changed the text file
merged text changes