edited file1 add file5
merged with adding_file2, resolved