Updated file 1
Fixed the conflicts