user 2 edit file 1
merging changes