undoing the changes in the file
merge changes