conflicts

github gui client woes