Edited myinfo file
conflict solved