Merge workstation changes