new GUI
resolved conflicts