Endrer gui
Fixing merging conflict