merged changes from (not connected) workstation