ProcGUI: reconcile merge