merge conflict dealt
new v2
Merge branch 'Gui'