edit text file
another edit
yet another change
resolving confict