Worked on filemerger and GUI changes