merge

Gui + parser