Small modifications
Modifications
Fixed conflicts
Solved conflicts
Resolved a merge conflict in MainGUI