mod: merge edining & gui to main