new data added
Doing something
inserted in file1
merge conflit removed