added testmake for gui
fixed merge conflict