Fixed merge artefacts due to moving functions around in the file. Don't do it.
Fixed merge artefacts due to moving functions around in the file. Don't do it.

ErmiasG/hopsworks,AlexHopsworks/hopsworks,AlexHopsworks/hopsworks,berthoug/hopsworks,ErmiasG/hopsworks,FilotasSiskos/hopsworks,ErmiasG/hopsworks,FilotasSiskos/hopsworks,AlexHopsworks/hopsworks,ErmiasG/hopsworks,FilotasSiskos/hopsworks,FilotasSiskos/hopsworks,ErmiasG/hopsworks,berthoug/hopsworks,AlexHopsworks/hopsworks,berthoug/hopsworks,FilotasSiskos/hopsworks,berthoug/hopsworks,ErmiasG/hopsworks,berthoug/hopsworks,AlexHopsworks/hopsworks,AlexHopsworks/hopsworks,FilotasSiskos/hopsworks,berthoug/hopsworks