added merging of the Xresources
added merging of the Xresources, added iconFile resource