changes to merge file.