updated file1
fixed conflict in file1