changed gui
resolved conflict