Edited myinfo file
Handle conflict