solved button fixed in GUI
fixed merge conflicts