details in stricmp function added
merge conflicts solved