some changes to the file_1 were made
merging