Commented segfaulting code (adding st button to gui)
Conflict solved