edited myinfofile
conflict resolved