pushing GUI
fixing merge
fixed character