added GUI
merge