stuff
fixed merge conflicts
removed linking of local environment