Trying to get the GUI working
fixing merge confs