Fix merge conflicts
Fix GUI typo
Fixed merge conflicts