Fixing overlords, error in gridsearch though
Fixed merge