new gui
fixed mergeconflicts