Fixed and merged workspace