Fixed merge issue; changing workstations