cleaned up merge confligt
cleaned up merge confligt

scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos,scalableminds/webknossos