removed extra folder containing the intensity scaling because it was no longer shared
fixed merge conflicts
updated with rubocop