Added Link to an existing workstation into Chef Server
Fix conflicts