TEST COMMIT: Added gui_json section.
Resolved the conflict and added Git Merge section