Changed newfile
Fixed conflict